diff --git a/general.ent b/general.ent
index 1629cea6cb..8d1f0d6557 100644
--- a/general.ent
+++ b/general.ent
@@ -341,9 +341,12 @@
-
+
+
+
+
diff --git a/pst/pst.xml b/pst/pst.xml
index ed0e47f56c..6e8151a7d9 100644
--- a/pst/pst.xml
+++ b/pst/pst.xml
@@ -5,10 +5,10 @@
+
-
-&pst-xml;
+
&pst-ps;
&pst-typesetting;
diff --git a/pst/xml/docbook-xsl.xml b/pst/xml/docbook-xsl.xml
index 6da55874bf..6d524c7d76 100644
--- a/pst/xml/docbook-xsl.xml
+++ b/pst/xml/docbook-xsl.xml
@@ -1,11 +1,107 @@
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
DocBook XSL Stylesheets-&docbook-xsl-version;
-&docbook-xsl-intro;
-&docbook-xsl-inst;
-&docbook-xsl-config;
-&docbook-xsl-desc;
+
+Introduction to DocBook XSL Stylesheets
+
+The DocBook XSL Stylesheets
+package contains XSL
+stylesheets. These are useful for performing transformations on
+XML DocBook files.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &docbook-xsl-size;
+Estimated Disk space required:
+&docbook-xsl-buildsize;
+Estimated build time:
+&docbook-xsl-time;
+
+
+DocBook XSL Stylesheets dependencies
+Required
+
+
+
+
+
+
+Installation of DocBook XSL Stylesheets
+
+Install DocBook XSL Stylesheets by running the following
+commands:
+
+install -d /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
+cp -af VERSION common extensions fo html htmlhelp images javahelp lib \
+ manpages params profiling template tools xhtml \
+ /usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version; &&
+install -d /usr/share/doc/xml &&
+cp -af doc/* /usr/share/doc/xml &&
+if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
+ --create /etc/xml/catalog; fi &&
+if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+ /etc/xml/docbook; fi &&
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl/1.65.1" \
+ "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl/1.65.1" \
+ "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://docbook.sourceforge.net/release/xsl/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://docbook.sourceforge.net/release/xsl/current" \
+ "/usr/share/xml/docbook/xsl-stylesheets-&docbook-xsl-version;" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateSystem" \
+ "http://docbook.sourceforge.net/release/xsl/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+ "http://docbook.sourceforge.net/release/xsl/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog
+
+
+
+
+Configuring DocBook XSL Stylesheets
+
+Config files
+/etc/xml/catalog
+
+
+Configuration Information
+
+The above installation script creates the files and updates the
+catalog.
+
+
+
+
+
+Contents
+
+The DocBook XSL
+Stylesheets package contains XSL
+style sheets for HTML and FO.
+
+
diff --git a/pst/xml/docbook.xml b/pst/xml/docbook.xml
index 3063c21668..71cca4cc03 100644
--- a/pst/xml/docbook.xml
+++ b/pst/xml/docbook.xml
@@ -1,11 +1,173 @@
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
DocBook XML DTD-&DocBook-version;
-&DocBook-intro;
-&DocBook-inst;
-&DocBook-config;
-&DocBook-desc;
+
+Introduction to DocBook XML DTD
+
+The DocBook XML DTD-&DocBook-version; package contains document type definitions for
+verification of XML data files against the DocBook rule
+set. These are useful for structuring books and software documentation
+to a standard allowing you to utilize transformations already written for that standard.
+
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &DocBook-size;
+Estimated Disk space required: &DocBook-buildsize;
+Estimated build time: &DocBook-time;
+
+
+DocBook XML DTD &DocBook-version; dependencies
+Required
+
+
+
+
+
+
+Installation of DocBook XML DTD
+
+Install DocBook XML DTD by running the following commands:
+
+install -d /usr/share/xml/docbook/xml-dtd-&DocBook-version; &&
+cp -af docbook.cat *.dtd ent/ *.mod /usr/share/xml/docbook/xml-dtd-&DocBook-version; &&
+if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout \
+ --create /etc/xml/catalog; fi &&
+if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+ /etc/xml/docbook; fi &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//ELEMENTS DocBook XML Information Pool V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbpoolx.mod" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD DocBook XML V&DocBook-version;//EN" \
+ "http://www.oasis-open.org/docbook/xml/&DocBook-version;/docbookx.dtd" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Character Entities V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbcentx.mod" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Notations V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbnotnx.mod" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Additional General Entities V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbgenent.mod" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbhierx.mod" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/soextblx.dtd" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD DocBook XML CALS Table Model V&DocBook-version;//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/calstblx.dtd" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://www.oasis-open.org/docbook/xml/&DocBook-version;" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://www.oasis-open.org/docbook/xml/&DocBook-version;" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "delegatePublic" \
+ "-//OASIS//ENTITIES DocBook XML" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegatePublic" \
+ "-//OASIS//DTD DocBook XML" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateSystem" \
+ "http://www.oasis-open.org/docbook/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+ "http://www.oasis-open.org/docbook/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog
+
+
+
+
+Configuring DocBook XML DTD
+
+Config files
+/etc/xml/catalog, /etc/xml/docbook
+
+
+Configuration Information
+
+The above installation script creates the files and updates the catalog.
+In order to install ScrollKeeper or to utilize
+DocBook XML
+DTD V&DocBook-version; when any version 4 is
+requested in the System Identifier, make the following entry:
+xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD DocBook XML V4.1.2//EN" \
+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "delegateSystem" \
+ "http://www.oasis-open.org/docbook/xml/4.1.2/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+ "http://www.oasis-open.org/docbook/xml/4.1.2/" \
+ "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteSystem" \
+ "http://www.oasis-open.org/docbook/xml/4.1.2" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://www.oasis-open.org/docbook/xml/4.1.2" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+ /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+ "http://www.oasis-open.org/docbook/xml/4.2" \
+ "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+ /etc/xml/docbook
+
+
+
+
+
+Contents
+
+The DocBook XML DTD package contains DTD files,
+MOD files and ENT files.
+
+
+
+Description
+
+DTD files
+DTD files contain a document type definition which defines the
+element types and the attribute lists that can be used in the
+corresponding XML files.
+
+MOD files
+MOD files contain components of the document type definition that are
+sourced into the DTD files.
+
+ENT files
+ENT files contain lists of named character entities
+allowed in HTML.
+
+
diff --git a/pst/xml/xml.xml b/pst/xml/xml.xml
index c7f15dce50..6d83318034 100644
--- a/pst/xml/xml.xml
+++ b/pst/xml/xml.xml
@@ -1,3 +1,9 @@
+
+ %general-entities;
+]>
+
Extensible Markup Language (XML)
@@ -6,7 +12,7 @@
type definition (DTD) and DocBook Stylesheets
which are used to validate, transform, format and publish DocBook documents.
-&DocBook;
-&docbook-xsl;
+
+