From 6bc7f45c6d48c859799c553a0405a39fc0cf83ad Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Sun, 22 Jul 2007 10:22:06 +0000
Subject: [PATCH] Mark up PIs with tag@class=xmlpi so that they can get picked
 up an formatted correctly by the doc build.

---
 xsl/common/pi.xsl                     |  2 +-
 xsl/fo/pi.xsl                         | 40 ++++++++++-----------
 xsl/html/pi.xsl                       | 50 +++++++++++++--------------
 xsl/html/xref.xsl                     |  2 ++
 xsl/params/glossary.as.blocks.xml     |  4 +--
 xsl/params/textinsert.extension.xml   |  8 +++--
 xsl/params/variablelist.as.blocks.xml |  6 ++--
 xsl/params/variablelist.as.table.xml  |  6 ++--
 8 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/xsl/common/pi.xsl b/xsl/common/pi.xsl
index 5c3df8815..b76c6b99d 100644
--- a/xsl/common/pi.xsl
+++ b/xsl/common/pi.xsl
@@ -89,7 +89,7 @@
 <doc:pi name="dbtimestamp" xmlns="">
   <refpurpose>Inserts a date timestamp</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbtimestamp</tag> PI at any point in a
+    <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>
diff --git a/xsl/fo/pi.xsl b/xsl/fo/pi.xsl
index e03e989e2..fd87c3ab1 100644
--- a/xsl/fo/pi.xsl
+++ b/xsl/fo/pi.xsl
@@ -45,7 +45,7 @@
 <doc:pi name="dbfo_background-color" xmlns="">
   <refpurpose>Sets background color for an image</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo background-color</tag> PI before or
+    <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
@@ -80,7 +80,7 @@
 <doc:pi name="dbfo_bgcolor" xmlns="">
   <refpurpose>Sets background color on a table row or table cell</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo bgcolor</tag> PI as child of a table row
+    <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>
@@ -112,7 +112,7 @@
 <doc:pi name="dbfo_float-type" xmlns="">
   <refpurpose>Specifies float behavior for a sidebar</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo float-type</tag> PI to specify the float
+    <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>
@@ -152,7 +152,7 @@
 <doc:pi name="dbfo_glossary-presentation" xmlns="">
   <refpurpose>Specifies presentation style for a glossary</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glossary-presentation</tag> PI as a child of
+    <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>
@@ -191,7 +191,7 @@
 <doc:pi name="dbfo_glosslist-presentation" xmlns="">
   <refpurpose>Specifies presentation style for a glosslist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glosslist-presentation</tag> PI as a child of
+    <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>
@@ -231,7 +231,7 @@
   <refpurpose>Specifies the glossterm width for a glossary or
     glosslist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glossterm-width</tag> PI as a child of a
+    <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>
@@ -270,7 +270,7 @@
   <refpurpose>Specifies “keep” behavior for a table, example,
     figure, or equation</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo keep-together</tag> PI as a child of a
+    <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
@@ -313,7 +313,7 @@
 <doc:pi name="dbfo_label-width" xmlns="">
   <refpurpose>Specifies the label width for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo label-width</tag> PI as a child of a
+    <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>
@@ -345,7 +345,7 @@
 <doc:pi name="dbfo_linenumbering.everyNth" xmlns="">
   <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child
+    <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>
@@ -383,7 +383,7 @@
 <doc:pi name="dbfo_linenumbering.separator" xmlns="">
   <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child
+    <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>
@@ -420,7 +420,7 @@
 <doc:pi name="dbfo_linenumbering.width" xmlns="">
   <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.width</tag> PI as a child
+    <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>
@@ -458,7 +458,7 @@
   <refpurpose>Specifies presentation style for a variablelist or
     segmentedlist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo list-presentation</tag> PI as a child of
+    <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>
@@ -512,7 +512,7 @@
 <doc:pi name="dbfo_list-width" xmlns="">
   <refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo list-width</tag> PI as a child of a
+    <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>
@@ -541,7 +541,7 @@
 <doc:pi name="dbfo_orientation" xmlns="">
   <refpurpose>Specifies the orientation for table row or cell</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo orientation</tag> PI as a child of an
+    <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>
@@ -570,7 +570,7 @@
 <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>dbfo pgwide</tag> PI as a child of an
+    <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>
@@ -609,7 +609,7 @@
   <refpurpose>Specifies the width for a table <tag>entry</tag> or
     <tag>row</tag></refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo rotated-width</tag> PI as a child of an
+    <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
@@ -639,7 +639,7 @@
 <doc:pi name="dbfo_sidebar-width" xmlns="">
   <refpurpose>Specifies the width of a sidebar</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo sidebar-width</tag> PI as a child of a
+    <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>
@@ -716,7 +716,7 @@
   <refpurpose>Specifies the width for a table or for revhistory
     output</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo table-width</tag> PI as a child or
+    <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
@@ -751,7 +751,7 @@
 <doc:pi name="dbfo_term-width" xmlns="">
   <refpurpose>Specifies the term width for a variablelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo term-width</tag> PI as a child of a
+    <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>
@@ -784,7 +784,7 @@
 <doc:pi name="dbfo_toc" xmlns="">
   <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo toc</tag> PI as a child of a
+    <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>
diff --git a/xsl/html/pi.xsl b/xsl/html/pi.xsl
index f14e94ba2..bc3d72ab9 100644
--- a/xsl/html/pi.xsl
+++ b/xsl/html/pi.xsl
@@ -41,7 +41,7 @@
 <doc:pi name="dbhtml_background-color" xmlns="">
   <refpurpose>Sets background color for an image</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml background-color</tag> PI before or
+    <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
@@ -76,7 +76,7 @@
 <doc:pi name="dbhtml_bgcolor" xmlns="">
   <refpurpose>Sets background color on a table row or table cell</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml bgcolor</tag> PI as child of a table row
+    <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>
@@ -108,7 +108,7 @@
 <doc:pi name="dbhtml_cellpadding" xmlns="">
   <refpurpose>Specifies cellpadding in table or qandaset output</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml cellpadding</tag> PI as a child of a
+    <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>
@@ -147,7 +147,7 @@
 <doc:pi name="dbhtml_cellspacing" xmlns="">
   <refpurpose>Specifies cellspacing in table or qandaset output</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml cellspacing</tag> PI as a child of a
+    <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>
@@ -187,7 +187,7 @@
 <doc:pi name="dbhtml_class" xmlns="">
   <refpurpose>Set value of the class attribute for a table row</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml class</tag> PI as a child of a
+    <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>
@@ -220,7 +220,7 @@
 <doc:pi name="dbhtml_dir" xmlns="">
   <refpurpose>Specifies a directory name in which to write files</refpurpose>
   <refdescription>
-    <para>When chunking output, use the <tag>dbhtml dir</tag> PI
+    <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
@@ -259,7 +259,7 @@
 <doc:pi name="dbhtml_filename" xmlns="">
   <refpurpose>Specifies a filename for a chunk</refpurpose>
   <refdescription>
-    <para>When chunking output, use the <tag>dbhtml filename</tag>
+    <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>
@@ -295,7 +295,7 @@
 <doc:pi name="dbhtml_funcsynopsis-style" xmlns="">
   <refpurpose>Specifies presentation style for a funcsynopsis</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml funcsynopsis-style</tag> PI as a child of
+    <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>
@@ -332,7 +332,7 @@
 <doc:pi name="dbhtml_img.src.path" xmlns="">
   <refpurpose>Specifies a path to the location of an image file</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml img.src.path</tag> PI before or
+    <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,
@@ -373,7 +373,7 @@
 <doc:pi name="dbhtml_label-width" xmlns="">
   <refpurpose>Specifies the label width for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml label-width</tag> PI as a child of a
+    <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>
@@ -405,7 +405,7 @@
 <doc:pi name="dbhtml_linenumbering.everyNth" xmlns="">
   <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml linenumbering.everyNth</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml 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>
@@ -443,7 +443,7 @@
 <doc:pi name="dbhtml_linenumbering.separator" xmlns="">
   <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml linenumbering.separator</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml 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>
@@ -480,7 +480,7 @@
 <doc:pi name="dbhtml_linenumbering.width" xmlns="">
   <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml 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>
@@ -518,7 +518,7 @@
   <refpurpose>Specifies presentation style for a variablelist or
     segmentedlist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of
+    <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>
@@ -567,7 +567,7 @@
 <doc:pi name="dbhtml_list-width" xmlns="">
   <refpurpose>Specifies the width of a variablelist or simplelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml list-width</tag> PI as a child of a
+    <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>
@@ -600,7 +600,7 @@
 <doc:pi name="dbhtml_row-height" xmlns="">
   <refpurpose>Specifies the height for a table row</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml row-height</tag> PI as a child of a
+    <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>
@@ -670,7 +670,7 @@
 <doc:pi name="dbhtml_table-summary" xmlns="">
   <refpurpose>Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml table-summary</tag> PI as a child of
+    <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
@@ -707,7 +707,7 @@
 <doc:pi name="dbhtml_table-width" xmlns="">
   <refpurpose>Specifies the width for a table</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml table-width</tag> PI as a child of a
+    <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>
@@ -743,7 +743,7 @@
 <doc:pi name="dbhtml_term-presentation" xmlns="">
   <refpurpose>Sets character formatting for terms in a variablelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml term-presentation</tag> PI as a child
+    <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>
@@ -786,7 +786,7 @@
 <doc:pi name="dbhtml_term-separator" xmlns="">
   <refpurpose>Specifies separator text among terms in a varlistentry</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml term-separator</tag> PI as a child
+    <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>
@@ -822,7 +822,7 @@
 <doc:pi name="dbhtml_term-width" xmlns="">
   <refpurpose>Specifies the term width for a variablelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml term-width</tag> PI as a child of a
+    <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>
@@ -855,7 +855,7 @@
 <doc:pi name="dbhtml_toc" xmlns="">
   <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml toc</tag> PI as a child of a
+    <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>
@@ -897,7 +897,7 @@
 <doc:pi name="dbcmdlist" xmlns="">
   <refpurpose>Generates a hyperlinked list of commands</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbcmdlist</tag> PI as the child of a
+    <para>Use the <tag class="xmlpi">dbcmdlist</tag> PI as the child of a
       <tag>refsynopsisdiv</tag> containing multiple
       <tag>cmdsynopsis</tag> instances; a hyperlinked navigational
       “command list” will be generated at the top of the
@@ -927,7 +927,7 @@
 <doc:pi name="dbfunclist" xmlns="">
   <refpurpose>Generates a hyperlinked list of functions</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfunclist</tag> PI as the child of a
+    <para>Use the <tag class="xmlpi">dbfunclist</tag> PI as the child of a
       <tag>refsynopsisdiv</tag> containing multiple
       <tag>funcsynopsis</tag> instances; a hyperlinked
       navigational “function list” will be generated at the top of
@@ -957,7 +957,7 @@
 <doc:pi name="dbhtml-include_href" xmlns="">
   <refpurpose>Copies an external well-formed HTML/XML file into current doc</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbhtml-include href</tag> PI anywhere in a
+    <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 “as
       is” into your HTML output at the point in document order
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 07ecbfbcb..035fc67a0 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -903,6 +903,7 @@
 <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"/>
@@ -949,6 +950,7 @@
     <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>
diff --git a/xsl/params/glossary.as.blocks.xml b/xsl/params/glossary.as.blocks.xml
index 51457f84d..e18ed19ab 100644
--- a/xsl/params/glossary.as.blocks.xml
+++ b/xsl/params/glossary.as.blocks.xml
@@ -30,8 +30,8 @@ parameter, you can force the stylesheets to produce block markup
 instead of proper lists.</para>
 
 <para>You can override this setting with a processing instruction as the
-child of <tag>glossary</tag>: <tag class="pi">dbfo
-glossary-presentation="blocks"</tag> or <tag class="pi">dbfo
+child of <tag>glossary</tag>: <tag class="xmlpi">dbfo
+glossary-presentation="blocks"</tag> or <tag class="xmlpi">dbfo
 glossary-presentation="list"</tag></para>
 
 </refsection>
diff --git a/xsl/params/textinsert.extension.xml b/xsl/params/textinsert.extension.xml
index 4d637115e..9f6a2a2ac 100644
--- a/xsl/params/textinsert.extension.xml
+++ b/xsl/params/textinsert.extension.xml
@@ -21,11 +21,13 @@
     <note>
       <para>To use the textinsert extension element, you must use
         either Saxon or Xalan as your XSLT processor (it doesn’t
-        work with xsltproc), along with either the <link
+        work with xsltproc), along with either the DocBook Saxon
+        extensions or DocBook Xalan extensions (for more
+        information about those extensions, see <link
           role="tcg" xlink:href="InstallingAProcessor.html#SaxonExtensions"
-          >DocBook Saxon Extensions</link> or <link
+          >DocBook Saxon Extensions</link> and <link
           role="tcg" xlink:href="InstallingAProcessor.html#XalanExtensions"
-          >DocBook Xalan Extensions</link>, and you must set both
+          >DocBook Xalan Extensions</link>), and you must set both
         the <parameter>use.extensions</parameter> and
         <parameter>textinsert.extension</parameter> parameters to
         <literal>1</literal>.</para>
diff --git a/xsl/params/variablelist.as.blocks.xml b/xsl/params/variablelist.as.blocks.xml
index 4a45fe0d4..71e1c98cf 100644
--- a/xsl/params/variablelist.as.blocks.xml
+++ b/xsl/params/variablelist.as.blocks.xml
@@ -29,13 +29,13 @@ unattractive lists. By setting this parameter, you can force the stylesheets
 to produce block markup instead of proper lists.</para>
 
 <para>You can override this setting with a processing instruction as the
-child of <tag>variablelist</tag>: <tag class="pi">dbfo
-list-presentation="blocks"</tag> or <tag class="pi">dbfo
+child of <tag>variablelist</tag>: <tag class="xmlpi">dbfo
+list-presentation="blocks"</tag> or <tag class="xmlpi">dbfo
 list-presentation="list"</tag>.</para>
 
 <para>When using <literal>list-presentation="list"</literal>,
 you can also control the amount of space used for the <tag>term</tag>s with 
-the <tag class="pi">dbfo term-width=".25in"</tag> processing instruction,
+the <tag class="xmlpi">dbfo term-width=".25in"</tag> processing instruction,
 the <tag class="attribute">termlength</tag> attribute on <tag>variablelist</tag>,
 or allow the stylesheets to attempt to calculate the amount of space to leave based on the 
 number of letters in the longest term.  
diff --git a/xsl/params/variablelist.as.table.xml b/xsl/params/variablelist.as.table.xml
index 2a670e2d0..bf712c62a 100644
--- a/xsl/params/variablelist.as.table.xml
+++ b/xsl/params/variablelist.as.table.xml
@@ -24,11 +24,11 @@
 <para>If non-zero, <tag>variablelist</tag>s will be formatted as
 tables. A processing instruction exists to specify a particualar width for the 
 column containing the <tag>term</tag>s:   
-<tag class="pi">dbhtml term-width=".25in"</tag></para>
+<tag class="xmlpi">dbhtml term-width=".25in"</tag></para>
 
 <para>You can override this setting with a processing instruction as the
-child of <tag>variablelist</tag>: <tag class="pi">dbhtml
-list-presentation="table"</tag> or <tag class="pi">dbhtml
+child of <tag>variablelist</tag>: <tag class="xmlpi">dbhtml
+list-presentation="table"</tag> or <tag class="xmlpi">dbhtml
 list-presentation="list"</tag>.</para>
 
 <para>This parameter only applys to the HTML transformations. In the
-- 
2.40.0