doc/yelp-xsl: A bunch of org changes to the xsldoc

15 files changed, 224 insertions, 334 deletions

diff --git a/doc/yelp-xsl/C/gnome-doc-xslt.xml b/doc/yelp-xsl/C/gnome-doc-xslt.xml
deleted file mode 100644
index a5352841..00000000
--- a/doc/yelp-xsl/C/gnome-doc-xslt.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- -*- indent-tabs-mode: nil -*- -->
-<?db.chunk.max_depth 2?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article id="index" lang="en">
-  <articleinfo>
-    <title>GNOME Documentation XSLT Manual</title>
-    
-    <abstract role="description">
-      <para>The GNOME Documentation XSLT stylesheets were created to provide fast DocBook to HTML
-      conversion for real-time document viewing in GNOME's help browser, <application>Yelp.</application></para>
-    </abstract>
-
-    <copyright>
-      <year>2004</year>
-
-      <holder>Shaun McCance</holder>
-    </copyright>
-
-    <publisher>
-      <publishername>GNOME Documentation Project</publishername>
-    </publisher>
-
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
-
-    <authorgroup>
-      <author role="maintainer">
-        <firstname>Shaun</firstname>
-
-        <surname>McCance</surname>
-
-        <affiliation>
-          <orgname>GNOME Documentation Project</orgname>
-        </affiliation>
-
-        <email>shaunm@gnome.org</email>
-      </author>
-
-      <author>
-        <firstname>Brent</firstname>
-
-        <surname>Smith</surname>
-
-        <affiliation>
-          <orgname>GNOME Documentation Project</orgname>
-        </affiliation>
-
-        <email>gnome@nextreality.net</email>
-      </author>
-    </authorgroup>
-
-    <revhistory>
-      <revision>
-        <revnumber>0.1</revnumber>
-
-        <date>2004-03-31</date>
-      </revision>
-
-      <revision>
-        <revnumber>0.2</revnumber>
-
-        <date>2006-02-11</date>
-      </revision>
-    </revhistory>
-  </articleinfo>
-
-  <section id="intro">
-    <title>Introduction</title>
-
-    <para>The GNOME XSLT Stylesheets are used to generate HTML from DocBook
-    files.</para>
-
-    <para>Some of the goals of these stylesheets are:<itemizedlist>
-        <listitem>
-          <para>To provide real-time translation of DocBook into HTML. The
-          GNOME Help Browser, <application>Yelp</application>, uses these
-          stylesheets to format help documents.</para>
-        </listitem>
-
-        <listitem>
-          <para>To provide a customized look and feel for GNOME's
-          documentation.</para>
-        </listitem>
-
-        <listitem>
-          <para>To provide translation support for GNOME documentation.</para>
-        </listitem>
-      </itemizedlist></para>
-  </section>
-
-  <section id="using">
-    <title>Using the Stylesheets</title>
-
-    <para>To use the stylesheets you should be familiar with the
-    <application>xsltproc</application> application. The first argument is the
-    location of the <filename>db2html.xsl</filename> stylesheet. The second
-    argument is the top-level docbook file for which to generate the
-    HTML.</para>
-
-    <example id="example-db2html">
-      <title>Generating HTML from a DocBook file</title>
-
-      <para><screen><prompt>$</prompt> xsltproc /usr/share/xml/gnome/xslt/docbook/html/db2html.xsl &lt;docbook file&gt;</screen></para>
-    </example>
-
-    <para>For more information on <application>xsltproc</application> and the
-    <application>libxslt</application> libraries, see <ulink
-    url="http://www.xmlsoft.org/">http://xmlsoft.org/</ulink>.</para>
-
-    <note>
-      <title>XInclude Processing</title>
-
-      <para>If you make use of <ulink
-      url="http://www.w3.org/TR/xinclude/">XInclude</ulink> to include other
-      files in your document, then you must use the 
-      <parameter>--xinclude</parameter> parameter to generate the complete
-      DocBook file before processing it with the
-      <filename>db2html.xsl</filename> stylesheet(s).</para>
-    </note>
-  </section>
-
-  <section id="parameters">
-    <title>Specifying Parameters</title>
-
-    <para>There are a number of parameters available in the stylesheets which
-    you can set to customize the generated html. An exhaustive list is
-    available in the following sections, but we will go over a few of the more
-    commonly used ones in this section.</para>
-
-    <para>To specify a parameter to the stylesheets, use the
-    <parameter>--stringparam</parameter> option of the
-    <application>xsltproc</application> application.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>db.chunk.chunk_top</term>
-
-        <listitem>
-          <para>Set this parameter to <literal>1</literal> if you want the
-          stylesheets to chunk<footnote>
-              <para>Chunking refers to creating a separate output file for an
-              element. For example, if there are three
-              <literal>&lt;sect1&gt;</literal> elements within a document,
-              (with no subsections) then there will be three files generated
-              for each element. Incidentally, the name of the files will be
-              the same as the element's <literal>id</literal>
-              attribute.</para>
-            </footnote> the top level element
-          (<literal>&lt;article&gt;</literal> or
-          <literal>&lt;book&gt;</literal>) into a file called
-          <filename>index.xhtml</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>db.chunk.max_depth</term>
-
-        <listitem>
-          <para>Specifies the maximum depth of chunked elements specified in
-          <parameter>db.chunk.chunks</parameter> parameter.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>db.chunk.extension</term>
-
-        <listitem>
-          <para>Set this parameter to <literal>the extension</literal> you
-          would like for the chunked output files.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <example id="example-parameters">
-      <title>Example of specifying stylesheet parameters</title>
-
-      <para><screen><prompt>$</prompt> xsltproc \
-   --stringparam db.chunk.chunk_top 1        \
-   --stringparam db.chunk.max_depth 1        \
-   --stringparam db.chunk.extension '.html'  \
-   /usr/share/xml/gnome/xslt/docbook/html/db2html.xsl \
-   &lt;path to docbook file&gt;</screen><xref
-      linkend="example-parameters" /> will chunk the top level element, chunk
-      to a maximum depth of 1 and chunk the title page.</para>
-    </example>
-  </section>
-
-  <section id="limitations">
-    <title>Limitations</title>
-
-    <para>Currently, the stylesheets require that there be an
-    <literal>id</literal> attribute on each chunked element.</para>
-  </section>
-
-  <include href="translating.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-  <section id="reference">
-    <title>Stylesheet Reference</title>
-
-    <!--BEGIN-->
-    <include href="db-chunk.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db-common.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db-label.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db-title.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db-xref.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-    <include href="db2html.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2xhtml.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-autotoc.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-bibliography.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-block.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-callout.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-classsynopsis.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-cmdsynopsis.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-css.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-division.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-ebnf.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-footnote.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-funcsynopsis.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-index.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-info.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-inline.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-l10n.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-list.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-media.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-qanda.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-refentry.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-table.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-title.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="db2html-xref.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-    <include href="db2omf.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-    <include href="theme.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="utils.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="gettext.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <include href="l10n-numbers.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    <!--END-->
-  </section>
-
-</article>
diff --git a/doc/yelp-xsl/C/index__M.page b/doc/yelp-xsl/C/index__M.page
deleted file mode 100644
index 6225912e..00000000
--- a/doc/yelp-xsl/C/index__M.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="index__M">
-  <info>
-    <link type="guide" xref="index"/>
-    <title type="link">Modes</title>
-    <title type="link" role="topic">Index of XSLT Modes</title>
-  </info>
-
-  <title>Index of XSLT Modes</title>
-
-  <links type="topic" style="linklist"/>
-</page>
diff --git a/doc/yelp-xsl/C/index__P.page b/doc/yelp-xsl/C/index__P.page
deleted file mode 100644
index 32e35f69..00000000
--- a/doc/yelp-xsl/C/index__P.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="index__P">
-  <info>
-    <link type="guide" xref="index"/>
-    <title type="link">Parameters</title>
-    <title type="link" role="topic">Index of XSLT Parameters</title>
-  </info>
-
-  <title>Index of XSLT Parameters</title>
-
-  <links type="topic" style="linklist"/>
-</page>
diff --git a/doc/yelp-xsl/C/index__S.page b/doc/yelp-xsl/C/index__S.page
deleted file mode 100644
index 35547cce..00000000
--- a/doc/yelp-xsl/C/index__S.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="index__S">
-  <info>
-    <link type="guide" xref="index"/>
-    <title type="link">Stylesheets</title>
-    <title type="link" role="topic">Index of XSLT Stylesheets</title>
-  </info>
-
-  <title>Index of XSLT Stylesheets</title>
-
-  <links type="topic" style="linklist"/>
-</page>
diff --git a/doc/yelp-xsl/C/index__T.page b/doc/yelp-xsl/C/index__T.page
deleted file mode 100644
index 2768e44d..00000000
--- a/doc/yelp-xsl/C/index__T.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="index__T">
-  <info>
-    <link type="guide" xref="index"/>
-    <title type="link">Templates</title>
-    <title type="link" role="topic">Index of XSLT Templates</title>
-  </info>
-
-  <title>Index of XSLT Templates</title>
-
-  <links type="topic" style="linklist"/>
-</page>
diff --git a/doc/yelp-xsl/C/modes.page b/doc/yelp-xsl/C/modes.page
new file mode 100644
index 00000000..83f754df
--- /dev/null
+++ b/doc/yelp-xsl/C/modes.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="modes">
+  <info>
+    <link type="guide" xref="index"/>
+    <title type="link">Modes</title>
+    <title type="link" role="topic">XSLT Modes</title>
+  </info>
+
+  <title>XSLT Modes</title>
+
+  <links type="topic" style="linklist" groups="mal2html">
+    <title>Mallard to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="mal">
+    <title>Mallard Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="db2html">
+    <title>DocBook to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="db">
+    <title>DocBook Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="html">
+    <title>HTML Output</title>
+  </links>
+  <links type="topic" style="linklist" groups="l10n">
+    <title>Localization</title>
+  </links>
+  <links type="topic" style="linklist" groups="color">
+    <title>Colors</title>
+  </links>
+  <links type="topic" style="linklist" groups="icons">
+    <title>Icons</title>
+  </links>
+  <links type="topic" style="linklist" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/doc/yelp-xsl/C/parameters.page b/doc/yelp-xsl/C/parameters.page
new file mode 100644
index 00000000..4b5d0443
--- /dev/null
+++ b/doc/yelp-xsl/C/parameters.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="parameters">
+  <info>
+    <link type="guide" xref="index"/>
+    <title type="link">Parameters</title>
+    <title type="link" role="topic">XSLT Parameters</title>
+  </info>
+
+  <title>XSLT Parameters</title>
+
+  <links type="topic" style="linklist" groups="mal2html">
+    <title>Mallard to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="mal">
+    <title>Mallard Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="db2html">
+    <title>DocBook to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="db">
+    <title>DocBook Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="html">
+    <title>HTML Output</title>
+  </links>
+  <links type="topic" style="linklist" groups="l10n">
+    <title>Localization</title>
+  </links>
+  <links type="topic" style="linklist" groups="color">
+    <title>Colors</title>
+  </links>
+  <links type="topic" style="linklist" groups="icons">
+    <title>Icons</title>
+  </links>
+  <links type="topic" style="linklist" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/doc/yelp-xsl/C/stubs.page b/doc/yelp-xsl/C/stubs.page
new file mode 100644
index 00000000..82e2af56
--- /dev/null
+++ b/doc/yelp-xsl/C/stubs.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="stubs">
+  <info>
+    <link type="guide" xref="index"/>
+    <title type="link">Stubs</title>
+    <title type="link" role="topic">XSLT Template Stubs</title>
+  </info>
+
+  <title>XSLT Template Stubs</title>
+
+  <links type="topic" style="linklist" groups="mal2html">
+    <title>Mallard to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="mal">
+    <title>Mallard Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="db2html">
+    <title>DocBook to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="db">
+    <title>DocBook Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="html">
+    <title>HTML Output</title>
+  </links>
+  <links type="topic" style="linklist" groups="l10n">
+    <title>Localization</title>
+  </links>
+  <links type="topic" style="linklist" groups="color">
+    <title>Colors</title>
+  </links>
+  <links type="topic" style="linklist" groups="icons">
+    <title>Icons</title>
+  </links>
+  <links type="topic" style="linklist" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/doc/yelp-xsl/C/stylesheets.page b/doc/yelp-xsl/C/stylesheets.page
new file mode 100644
index 00000000..efd59ac7
--- /dev/null
+++ b/doc/yelp-xsl/C/stylesheets.page
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="stylesheets">
+  <info>
+    <link type="guide" xref="index"/>
+    <title type="link">Stylesheets</title>
+    <title type="link" role="topic">XSLT Stylesheets</title>
+  </info>
+
+  <title>XSLT Stylesheets</title>
+
+  <links type="topic" style="linklist" groups="mal2html mal2xhtml">
+    <title>Mallard to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="mal">
+    <title>Mallard Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="db2html db2xhtml">
+    <title>DocBook to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="db">
+    <title>DocBook Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="html l10n color icons">
+    <title>Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/doc/yelp-xsl/C/templates.page b/doc/yelp-xsl/C/templates.page
new file mode 100644
index 00000000..c7dfc0fe
--- /dev/null
+++ b/doc/yelp-xsl/C/templates.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="templates">
+  <info>
+    <link type="guide" xref="index"/>
+    <title type="link">Templates</title>
+    <title type="link" role="topic">XSLT Templates</title>
+  </info>
+
+  <title>XSLT Templates</title>
+
+  <links type="topic" style="linklist" groups="mal2html">
+    <title>Mallard to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="mal">
+    <title>Mallard Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="db2html">
+    <title>DocBook to HTML</title>
+  </links>
+  <links type="topic" style="linklist" groups="db">
+    <title>DocBook Common</title>
+  </links>
+  <links type="topic" style="linklist" groups="html">
+    <title>HTML Output</title>
+  </links>
+  <links type="topic" style="linklist" groups="l10n">
+    <title>Localization</title>
+  </links>
+  <links type="topic" style="linklist" groups="color">
+    <title>Colors</title>
+  </links>
+  <links type="topic" style="linklist" groups="icons">
+    <title>Icons</title>
+  </links>
+  <links type="topic" style="linklist" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/doc/yelp-xsl/Makefile.am b/doc/yelp-xsl/Makefile.am
index 43283eda..6ff3eb30 100644
--- a/doc/yelp-xsl/Makefile.am
+++ b/doc/yelp-xsl/Makefile.am
@@ -58,7 +58,7 @@ gnome-doc-xslt-check-xsldoc: $(xsldoc_docs)
 .PHONY: xsldoc-clean
 clean-local: xsldoc-clean
 xsldoc-clean:
-	rm -f $(xsldoc_pages) C/T__*.page C/P__*.page C/M__*.page C/index.cache
+	rm -f $(xsldoc_pages) C/*.*.page C/index.cache
 
 EXTRA_DIST = 			\
 	mal2cache		\
diff --git a/doc/yelp-xsl/xsldoc-scan.awk b/doc/yelp-xsl/xsldoc-scan.awk
index 14c19047..002dbec2 100644
--- a/doc/yelp-xsl/xsldoc-scan.awk
+++ b/doc/yelp-xsl/xsldoc-scan.awk
@@ -63,15 +63,14 @@ function runline (line, ix, jx, pre, aft, char, name, id, fmt) {
 	char = substr(line, ix, 1);
 	name = substr(line, ix + 2, jx - ix - 3);
 	id = name;
-	while (sub(/[\.]/, "_", id));
 	if (char == "!")
 	    fmt = "<file xref='%s'>%s</file>";
 	else if (char == "*")
-	    fmt = "<code style='xslt-template' xref='T__%s'>%s</code>";
+	    fmt = "<code style='xslt-template' xref='%s'>%s</code>";
 	else if (char == "%")
-	    fmt = "<code style='xslt-mode' xref='M__%s'>%s</code>";
+	    fmt = "<code style='xslt-mode' xref='%s'>%s</code>";
 	else if (char == "@") 
-	    fmt = "<code style='xslt-param' xref='P__%s'>%s</code>";
+	    fmt = "<code style='xslt-param' xref='P.%s'>%s</code>";
 	else if (char == "$") 
 	    fmt = "<code style='xslt-param'>"name"</code>";
 	else if (char == "#")
diff --git a/doc/yelp-xsl/xsldoc-scan.xsl b/doc/yelp-xsl/xsldoc-scan.xsl
index 193530af..83d4ca4c 100644
--- a/doc/yelp-xsl/xsldoc-scan.xsl
+++ b/doc/yelp-xsl/xsldoc-scan.xsl
@@ -88,8 +88,7 @@ free software.
         <xsl:for-each select="$calls_templates">
           <xsl:variable name="name" select="string(.)"/>
           <xsl:if test="not($page/processing-instruction('xslt-private')[string(.) = $name])">
-            <xsl:variable name="id" select="concat('T__', translate($name, '.', '_'))"/>
-            <item><p><link xref="{$id}"/></p></item>
+            <item><p><link xref="{$name}"/></p></item>
           </xsl:if>
         </xsl:for-each>
       </list>
@@ -107,8 +106,7 @@ free software.
         <xsl:variable name="mode" select="string(.)"/>
         <xsl:if test="not($page/processing-instruction('xslt-private')[string(.) = $mode])">
           <xsl:if test="not($node//mal:section[@style = 'xslt-mode' and mal:title = $mode])">
-            <xsl:variable name="id" select="concat('M__', translate($mode, '.', '_'))"/>
-            <link xref="{$id}"/>
+            <link xref="{$mode}"/>
           </xsl:if>
         </xsl:if>
       </xsl:for-each>
@@ -129,8 +127,9 @@ free software.
   <xsl:variable name="page" select="."/>
   <page id="{$xsldoc.id}" type="guide" style="xslt-stylesheet">
     <xsl:copy-of select="processing-instruction()"/>
+    <xsl:variable name="prefix" select="str:tokenize($xsldoc.id, '.-_')[1]"/>
     <info>
-      <link type="guide" xref="index__S"/>
+      <link type="guide" xref="stylesheets" group="{$prefix}"/>
       <xsl:if test="string(mal:desc) != ''">
         <xsl:copy-of select="mal:desc"/>
       </xsl:if>
@@ -143,17 +142,14 @@ free software.
           <xsl:when test="$page/processing-instruction('xslt-private')[string(.) = $base]"/>
           <xsl:when test="processing-instruction('pass')">
             <xsl:for-each select="document(@href, /)//xsl:include">
-              <xsl:variable name="subpage" select="/mal:page"/>
               <xsl:variable name="subbase" select="substring-before(str:split(@href, '/')[last()], '.xsl')"/>
-              <xsl:if test="not($subpage/processing-instruction('xslt-private')[string(.) = $subbase])">
-                <xsl:variable name="id" select="translate($subbase, '.', '_')"/>
-                <link type="topic" xref="{$id}" group="S"/>
+              <xsl:if test="not(/xsl:stylesheet/comment()[normalize-space(.) = concat('#! ', $subbase)])">
+                <link type="topic" xref="{$subbase}" group="stylesheets"/>
               </xsl:if>
             </xsl:for-each>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:variable name="id" select="translate($base, '.', '_')"/>
-            <link type="topic" xref="{$id}" group="S"/>
+            <link type="topic" xref="{$base}" group="stylesheets"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
@@ -161,24 +157,21 @@ free software.
       <xsl:for-each select="$xslt_file/xsl:template/@name">
         <xsl:variable name="name" select="string(.)"/>
         <xsl:if test="not($page/processing-instruction('xslt-private')[string(.) = $name])">
-          <xsl:variable name="id" select="concat('T__', translate($name, '.', '_'))"/>
-          <link type="xslt-defines-template" xref="{$id}"/>
+          <link type="xslt-defines-template" xref="{$name}"/>
         </xsl:if>
       </xsl:for-each>
       <!-- xslt-implements-mode -->
       <xsl:for-each select="set:distinct($xslt_file//xsl:template/@mode)">
         <xsl:variable name="mode" select="string(.)"/>
         <xsl:if test="not($page/processing-instruction('xslt-private')[string(.) = $mode])">
-          <xsl:variable name="id" select="concat('M__', translate($mode, '.', '_'))"/>
-          <link type="xslt-implements-mode" xref="{$id}"/>
+          <link type="xslt-implements-mode" xref="{$mode}"/>
         </xsl:if>
       </xsl:for-each>
       <!-- xslt-defines-param -->
       <xsl:for-each select="$xslt_file/xsl:param/@name">
         <xsl:variable name="name" select="string(.)"/>
         <xsl:if test="not($page/processing-instruction('xslt-private')[string(.) = $name])">
-          <xsl:variable name="id" select="concat('P__', translate($name, '.', '_'))"/>
-          <link type="xslt-defines-param" xref="{$id}"/>
+          <link type="xslt-defines-param" xref="{concat('P.', $name)}"/>
         </xsl:if>
       </xsl:for-each>
       <!-- xslt-uses-param -->
@@ -207,8 +200,7 @@ free software.
         </xsl:for-each>
       </xsl:variable>
       <xsl:for-each select="set:distinct(exsl:node-set($uses-params)/mal:param)">
-        <xsl:variable name="id" select="concat('P__', translate(string(.), '.', '_'))"/>
-        <link type="xslt-uses-param" xref="{$id}"/>
+        <link type="xslt-uses-param" xref="{concat('P.', .)}"/>
       </xsl:for-each>
     </info>
     <xsl:copy-of select="mal:title"/>
@@ -218,16 +210,16 @@ free software.
       </p>
     </xsl:if>
     <xsl:apply-templates/>
-    <links type="topic" groups="S" style="linklist">
+    <links type="topic" groups="stylesheets" style="linklist">
       <title>Stylesheets</title>
     </links>
-    <links type="topic" groups="P" style="linklist">
+    <links type="topic" groups="parameters" style="linklist">
       <title>Parameters</title>
     </links>
-    <links type="topic" groups="M" style="linklist">
+    <links type="topic" groups="modes" style="linklist">
       <title>Modes</title>
     </links>
-    <links type="topic" groups="T" style="linklist">
+    <links type="topic" groups="templates" style="linklist">
       <title>Templates</title>
     </links>
     <xsl:variable name="requires" select="$page/mal:info/mal:link[@type = 'xslt-requires']"/>
@@ -259,26 +251,30 @@ free software.
   <xsl:variable name="type">
     <xsl:choose>
       <xsl:when test="@style = 'xslt-template'">
-        <xsl:text>T</xsl:text>
+        <xsl:text>templates</xsl:text>
       </xsl:when>
       <xsl:when test="@style = 'xslt-mode'">
-        <xsl:text>M</xsl:text>
+        <xsl:text>modes</xsl:text>
       </xsl:when>
       <xsl:when test="@style = 'xslt-param'">
-        <xsl:text>P</xsl:text>
+        <xsl:text>parameters</xsl:text>
       </xsl:when>
     </xsl:choose>
   </xsl:variable>
   <xsl:variable name="id">
-    <xsl:value-of select="concat($type, '__', translate(mal:title, '.', '_'))"/>
+    <xsl:if test="$type = 'parameters'">
+      <xsl:text>P.</xsl:text>
+    </xsl:if>
+    <xsl:value-of select="mal:title"/>
   </xsl:variable>
   <exsl:document href="{$id}.page">
     <page id="{$id}" type="topic" style="{@style}">
+      <xsl:variable name="prefix" select="str:tokenize(mal:title, '.-_')[1]"/>
       <info>
         <link type="guide" xref="{$xsldoc.id}" group="{$type}"/>
-        <link type="guide" xref="index__{$type}"/>
+        <link type="guide" xref="{$type}" group="{$prefix}"/>
         <xsl:if test="count(mal:info/xsldoc:stub) > 0">
-          <link type="guide" xref="stubs"/>
+          <link type="guide" xref="stubs" group="{$prefix}"/>
         </xsl:if>
         <xsl:call-template name="revision"/>
         <xsl:copy-of select="mal:info/*[not(self::mal:revision)]"/>
@@ -289,7 +285,7 @@ free software.
           <xsl:copy-of select="mal:info/mal:desc/node()"/>
         </p>
       </xsl:if>
-      <xsl:if test="$type = 'T'">
+      <xsl:if test="$type = 'templates'">
         <xsl:if test="count(mal:info/xsldoc:stub) > 0">
           <note>
             <p>This template is a stub. Customizations may override it for
@@ -298,7 +294,7 @@ free software.
         </xsl:if>
       </xsl:if>
       <xsl:apply-templates/>
-      <xsl:if test="$type = 'T'">
+      <xsl:if test="$type = 'templates'">
         <xsl:variable name="title" select="mal:title"/>
         <xsl:variable name="xslt_node" select="$xslt_file//xsl:template[@name = $title]"/>
         <xsl:call-template name="calls_templates">
diff --git a/xslt/docbook/html/db2html-division.xsl b/xslt/docbook/html/db2html-division.xsl
index 53f8f3d1..2abd2888 100644
--- a/xslt/docbook/html/db2html-division.xsl
+++ b/xslt/docbook/html/db2html-division.xsl
@@ -161,6 +161,7 @@ REMARK: Talk about some of the parameters
   </xsl:choose>
 </xsl:template>
 
+<!--#* _db2html.division.div.inner -->
 <xsl:template name="_db2html.division.div.inner">
   <xsl:param name="node"/>
   <xsl:param name="info"/>
diff --git a/xslt/mallard/common/mal-gloss.xsl b/xslt/mallard/common/mal-gloss.xsl
index 8e7ef4a7..96dce9f8 100644
--- a/xslt/mallard/common/mal-gloss.xsl
+++ b/xslt/mallard/common/mal-gloss.xsl
@@ -26,7 +26,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
                 version="1.0">
 
 <!--!!==========================================================================
-Mallard - Glossaries
+Mallard Glossaries
 Common templates for the Mallard Glossary extension.
 
 This stylesheet contains utility templates for locating and linking to terms