- Removing guide and topic in favor of page

* spec/10minutes.xml:
* spec/explore.xml:
* spec/mal_TODO.xml:
* spec/mal_app.xml:
* spec/mal_attr.xml:
* spec/mal_block.xml:
* spec/mal_caption.xml:
* spec/mal_cite.xml:
* spec/mal_cmd.xml:
* spec/mal_code.xml:
* spec/mal_comment.xml:
* spec/mal_copyright.xml:
* spec/mal_credit.xml:
* spec/mal_date.xml:
* spec/mal_em.xml:
* spec/mal_email.xml:
* spec/mal_figure.xml:
* spec/mal_file.xml:
* spec/mal_gui.xml:
* spec/mal_guide.xml:
* spec/mal_info.xml:
* spec/mal_inline.xml:
* spec/mal_input.xml:
* spec/mal_item.xml:
* spec/mal_key.xml:
* spec/mal_license.xml:
* spec/mal_link.xml:
* spec/mal_list.xml:
* spec/mal_list_bullet.xml:
* spec/mal_list_definition.xml:
* spec/mal_list_numbered.xml:
* spec/mal_list_tree.xml:
* spec/mal_media.xml:
* spec/mal_name.xml:
* spec/mal_note.xml:
* spec/mal_output.xml:
* spec/mal_p.xml:
* spec/mal_quote.xml:
* spec/mal_screen.xml:
* spec/mal_section.xml:
* spec/mal_subtitle.xml:
* spec/mal_synopsis.xml:
* spec/mal_sys.xml:
* spec/mal_table.xml:
* spec/mal_title.xml:
* spec/mal_topic.xml:
* spec/mal_var.xml:
* spec/mal_version.xml:
* spec/mallard.xml:
* spec/principle-guide.xml:
* spec/principle-justenough.xml:
* spec/principle-redundancy.xml:
* spec/principles.xml:
* spec/spec.xml:
* spec/spec_info.xml:
* spec/spec_pages.xml:
* xslt/mal2cache.xsl:
* xslt/mal2html-page.xsl:
* xslt/mal2html.xsl:
- Removing guide and topic in favor of page

svn path=/trunk/; revision=902

60 files changed, 227 insertions, 308 deletions

diff --git a/sandbox/mallard/ChangeLog b/sandbox/mallard/ChangeLog
index 5dc449e..7675e1f 100644
--- a/sandbox/mallard/ChangeLog
+++ b/sandbox/mallard/ChangeLog
@@ -1,3 +1,66 @@
+2007-03-15  Shaun McCance  <shaunm@gnome.org>
+
+	* spec/10minutes.xml:
+	* spec/explore.xml:
+	* spec/mal_TODO.xml:
+	* spec/mal_app.xml:
+	* spec/mal_attr.xml:
+	* spec/mal_block.xml:
+	* spec/mal_caption.xml:
+	* spec/mal_cite.xml:
+	* spec/mal_cmd.xml:
+	* spec/mal_code.xml:
+	* spec/mal_comment.xml:
+	* spec/mal_copyright.xml:
+	* spec/mal_credit.xml:
+	* spec/mal_date.xml:
+	* spec/mal_em.xml:
+	* spec/mal_email.xml:
+	* spec/mal_figure.xml:
+	* spec/mal_file.xml:
+	* spec/mal_gui.xml:
+	* spec/mal_guide.xml:
+	* spec/mal_info.xml:
+	* spec/mal_inline.xml:
+	* spec/mal_input.xml:
+	* spec/mal_item.xml:
+	* spec/mal_key.xml:
+	* spec/mal_license.xml:
+	* spec/mal_link.xml:
+	* spec/mal_list.xml:
+	* spec/mal_list_bullet.xml:
+	* spec/mal_list_definition.xml:
+	* spec/mal_list_numbered.xml:
+	* spec/mal_list_tree.xml:
+	* spec/mal_media.xml:
+	* spec/mal_name.xml:
+	* spec/mal_note.xml:
+	* spec/mal_output.xml:
+	* spec/mal_p.xml:
+	* spec/mal_quote.xml:
+	* spec/mal_screen.xml:
+	* spec/mal_section.xml:
+	* spec/mal_subtitle.xml:
+	* spec/mal_synopsis.xml:
+	* spec/mal_sys.xml:
+	* spec/mal_table.xml:
+	* spec/mal_title.xml:
+	* spec/mal_topic.xml:
+	* spec/mal_var.xml:
+	* spec/mal_version.xml:
+	* spec/mallard.xml:
+	* spec/principle-guide.xml:
+	* spec/principle-justenough.xml:
+	* spec/principle-redundancy.xml:
+	* spec/principles.xml:
+	* spec/spec.xml:
+	* spec/spec_info.xml:
+	* spec/spec_pages.xml:
+	* xslt/mal2cache.xsl:
+	* xslt/mal2html-page.xsl:
+	* xslt/mal2html.xsl:
+	- Removing guide and topic in favor of page
+
 2007-03-14  Shaun McCance  <shaunm@gnome.org>
 
 	* xslt/mal2html-page.xsl:
diff --git a/sandbox/mallard/spec/10minutes.xml b/sandbox/mallard/spec/10minutes.xml
index b085625..888c11c 100644
--- a/sandbox/mallard/spec/10minutes.xml
+++ b/sandbox/mallard/spec/10minutes.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="10minutes">
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -12,4 +12,4 @@
   <p>Add content</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/explore.xml b/sandbox/mallard/spec/explore.xml
index f602e2c..67313ef 100644
--- a/sandbox/mallard/spec/explore.xml
+++ b/sandbox/mallard/spec/explore.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="explore">
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -12,4 +12,4 @@
   <p>Add content</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_TODO.xml b/sandbox/mallard/spec/mal_TODO.xml
index 6e70073..02bd78d 100644
--- a/sandbox/mallard/spec/mal_TODO.xml
+++ b/sandbox/mallard/spec/mal_TODO.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_TODO">
 <info>
 </info>
@@ -6,8 +6,6 @@
 <title>TODO</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-default namespace = "http://www.gnome.org/~shaunm/mallard"
-start = (mal_guide | mal_topic)
 </code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_app.xml b/sandbox/mallard/spec/mal_app.xml
index 4ff1eb4..3601156 100644
--- a/sandbox/mallard/spec/mal_app.xml
+++ b/sandbox/mallard/spec/mal_app.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_app">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -48,4 +48,4 @@ this purpose instead.</p>
 </section>
 <!-- END processing -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_attr.xml b/sandbox/mallard/spec/mal_attr.xml
index b65623e..5a92922 100644
--- a/sandbox/mallard/spec/mal_attr.xml
+++ b/sandbox/mallard/spec/mal_attr.xml
@@ -1,2 +1,2 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard">
-</topic>
+<page xmlns="http://www.gnome.org/~shaunm/mallard">
+</page>
diff --git a/sandbox/mallard/spec/mal_block.xml b/sandbox/mallard/spec/mal_block.xml
index 556cd8d..8243218 100644
--- a/sandbox/mallard/spec/mal_block.xml
+++ b/sandbox/mallard/spec/mal_block.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_block">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="mal_block">
 <info>
   <link type="guide" xref="spec"/>
   <version number="0.1" date="2007-02-21" status="incomplete"/>
@@ -44,4 +45,4 @@ mal_block = (
 </section>
 <!-- END containers -->
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/mal_caption.xml b/sandbox/mallard/spec/mal_caption.xml
index a5115a5..590b8ce 100644
--- a/sandbox/mallard/spec/mal_caption.xml
+++ b/sandbox/mallard/spec/mal_caption.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_caption">
 <info>
   <version number="0.1" date="2007-02-05" status="draft"/>
@@ -74,4 +74,4 @@ general <link xref="mal_inline">inline content</link>.</p>
 </section>
 <!-- END processing -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_cite.xml b/sandbox/mallard/spec/mal_cite.xml
index eb64f0d..886bd90 100644
--- a/sandbox/mallard/spec/mal_cite.xml
+++ b/sandbox/mallard/spec/mal_cite.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_cite">
 <info>
   <version number="0.1" date="2007-02-08" status="draft"/>
@@ -31,4 +31,4 @@ element.</p>
   <p>Add examples, processing expectations.</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_cmd.xml b/sandbox/mallard/spec/mal_cmd.xml
index 7043203..f820085 100644
--- a/sandbox/mallard/spec/mal_cmd.xml
+++ b/sandbox/mallard/spec/mal_cmd.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_cmd">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -69,4 +69,4 @@ with the name of the file.</p>
 </section>
 <!-- END processing -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_code.xml b/sandbox/mallard/spec/mal_code.xml
index ab738fb..8274710 100644
--- a/sandbox/mallard/spec/mal_code.xml
+++ b/sandbox/mallard/spec/mal_code.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_code">
 <info>
   <link type="guide" xref="mal_block#simple"/>
@@ -61,4 +61,4 @@ mal_code_inline = element code {
 </section>
 <!-- END docbook -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_comment.xml b/sandbox/mallard/spec/mal_comment.xml
index 4519c78..cb33294 100644
--- a/sandbox/mallard/spec/mal_comment.xml
+++ b/sandbox/mallard/spec/mal_comment.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_comment">
 <info>
   <link type="guide" xref="mal_block#containers"/>
@@ -47,4 +47,4 @@ attribute.  Writers are highly encouraged to provide a <code xref="mal_date">mal
   </comment>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_copyright.xml b/sandbox/mallard/spec/mal_copyright.xml
index 4f1cb4c..9f78541 100644
--- a/sandbox/mallard/spec/mal_copyright.xml
+++ b/sandbox/mallard/spec/mal_copyright.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_copyright">
 <info>
   <version number="0.1" date="2007-02-23" status="stub"/>
@@ -10,4 +10,4 @@
 
 <title>Copyright Information</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_credit.xml b/sandbox/mallard/spec/mal_credit.xml
index efbbc0e..393bcd4 100644
--- a/sandbox/mallard/spec/mal_credit.xml
+++ b/sandbox/mallard/spec/mal_credit.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_credit">
 <info>
   <link type="guide" xref="spec_info"/>
@@ -24,4 +24,4 @@ mal_credit = element credit {
   <p>Add examples, processing expectations</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_date.xml b/sandbox/mallard/spec/mal_date.xml
index 5e769e3..1a07897 100644
--- a/sandbox/mallard/spec/mal_date.xml
+++ b/sandbox/mallard/spec/mal_date.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_date">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -17,4 +17,4 @@ mal_date = element date {
   <p>Add examples, processing expectations</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_em.xml b/sandbox/mallard/spec/mal_em.xml
index 293cd2d..a761ca3 100644
--- a/sandbox/mallard/spec/mal_em.xml
+++ b/sandbox/mallard/spec/mal_em.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_em">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -20,4 +20,4 @@ mal_em = element em {
   <p>Add examples, processing expectations</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_email.xml b/sandbox/mallard/spec/mal_email.xml
deleted file mode 100644
index 8896a92..0000000
--- a/sandbox/mallard/spec/mal_email.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_email">
-<info>
-  <link type="guide" xref="mal_inline"/>
-</info>
-
-<title>Email Address</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_email = element email {
-  <link xref="mal_inline#simple">mal_inline_simple</link>+
-}
-</code></synopsis>
-
-<comment>
-  <cite><name>Shaun McCance</name><date>2007-01-30</date></cite>
-  <p>Add examples, processing expectations</p>
-</comment>
-
-</topic>
diff --git a/sandbox/mallard/spec/mal_figure.xml b/sandbox/mallard/spec/mal_figure.xml
index d4f0784..d075ab8 100644
--- a/sandbox/mallard/spec/mal_figure.xml
+++ b/sandbox/mallard/spec/mal_figure.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_figure">
 <info>
   <link type="guide" xref="mal_block#containers"/>
@@ -21,4 +21,4 @@ mal_figure = element figure {
   <p>A way to float right, a'la wikipedia?</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_file.xml b/sandbox/mallard/spec/mal_file.xml
index 7a79d2c..c6bf3ec 100644
--- a/sandbox/mallard/spec/mal_file.xml
+++ b/sandbox/mallard/spec/mal_file.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_file">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -20,4 +20,4 @@ mal_file = element file {
   <p>Add examples, processing expectations</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_gui.xml b/sandbox/mallard/spec/mal_gui.xml
index 25af6e5..3643bf0 100644
--- a/sandbox/mallard/spec/mal_gui.xml
+++ b/sandbox/mallard/spec/mal_gui.xml
@@ -1,5 +1,5 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_gui">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      id="mal_gui">
 <info>
   <link type="guide" xref="mal_inline"/>
   <link type="seealso" xref="mal_link#ubiquitous"/>
@@ -27,4 +27,4 @@ mal_gui = element gui {
   <p>Fix the content model, make type correspond to gui/inline content.</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_guide.xml b/sandbox/mallard/spec/mal_guide.xml
deleted file mode 100644
index 6ad11b7..0000000
--- a/sandbox/mallard/spec/mal_guide.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_guide">
-<info>
-  <link type="guide" xref="spec_pages"/>
-  <version number="0.1" date="2007-02-21" status="stub"/>
-</info>
-
-<title>Guide Pages</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_guide = element guide {
-  <link xref="mal_info">mal_info_guide</link>?,
-  <link xref="mal_title">mal_title</link>,
-  <link xref="mal_block">mal_block</link>+,
-  <link xref="mal_section">mal_section_guide</link>*
-}</code></synopsis>
-
-<comment>
-  <cite><name>Shaun McCance</name><date>2007-01-30</date></cite>
-  <p>Add some intro text, examples, processing expectations.</p>
-</comment>
-
-</topic>
diff --git a/sandbox/mallard/spec/mal_info.xml b/sandbox/mallard/spec/mal_info.xml
index 45dcec7..e6321b1 100644
--- a/sandbox/mallard/spec/mal_info.xml
+++ b/sandbox/mallard/spec/mal_info.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard">
+<page xmlns="http://www.gnome.org/~shaunm/mallard">
 <!--
 credit (type)
 credit/date
@@ -17,4 +17,4 @@ link (guide/page/seealso)
 ? desc
 ? keyword
 -->
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_inline.xml b/sandbox/mallard/spec/mal_inline.xml
index 356e195..404de62 100644
--- a/sandbox/mallard/spec/mal_inline.xml
+++ b/sandbox/mallard/spec/mal_inline.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_inline">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="mal_inline">
 <info>
   <link type="guide" xref="spec"/>
   <version number="0.1" date="2007-02-21" status="incomplete"/>
@@ -31,4 +32,4 @@ mal_inline_simple = ( <link xref="mal_var">mal_var</link> | text )
   <p>Add some intro text</p>
 </comment>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/mal_input.xml b/sandbox/mallard/spec/mal_input.xml
index 30b5c18..32619fe 100644
--- a/sandbox/mallard/spec/mal_input.xml
+++ b/sandbox/mallard/spec/mal_input.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_input">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -8,4 +8,4 @@
 
 <title>User Input</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_item.xml b/sandbox/mallard/spec/mal_item.xml
index b65623e..5a92922 100644
--- a/sandbox/mallard/spec/mal_item.xml
+++ b/sandbox/mallard/spec/mal_item.xml
@@ -1,2 +1,2 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard">
-</topic>
+<page xmlns="http://www.gnome.org/~shaunm/mallard">
+</page>
diff --git a/sandbox/mallard/spec/mal_key.xml b/sandbox/mallard/spec/mal_key.xml
index 8458199..00819a7 100644
--- a/sandbox/mallard/spec/mal_key.xml
+++ b/sandbox/mallard/spec/mal_key.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_key">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -8,4 +8,4 @@
 
 <title>Key Strokes</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_license.xml b/sandbox/mallard/spec/mal_license.xml
index 89f0ee6..803560f 100644
--- a/sandbox/mallard/spec/mal_license.xml
+++ b/sandbox/mallard/spec/mal_license.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_license">
 <info>
   <link type="guide" xref="spec_info"/>
@@ -7,4 +7,4 @@
 
 <title>License Information</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_link.xml b/sandbox/mallard/spec/mal_link.xml
index 2bc47e8..505e701 100644
--- a/sandbox/mallard/spec/mal_link.xml
+++ b/sandbox/mallard/spec/mal_link.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_link">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -31,4 +31,4 @@ mal_link_attr = (
 </section>
 <!-- END ubiquitous -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_list.xml b/sandbox/mallard/spec/mal_list.xml
index 238334f..9559356 100644
--- a/sandbox/mallard/spec/mal_list.xml
+++ b/sandbox/mallard/spec/mal_list.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_list">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="mal_list">
 <info>
   <link type="guide" xref="mal_block#containers"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
@@ -25,4 +26,4 @@ mal_list = (
   <p>Unmarked lists and segmented lists</p>
 </comment>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/mal_list_bullet.xml b/sandbox/mallard/spec/mal_list_bullet.xml
index ad49cb6..0d5a4d8 100644
--- a/sandbox/mallard/spec/mal_list_bullet.xml
+++ b/sandbox/mallard/spec/mal_list_bullet.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_list_bullet">
 <info>
   <link type="guide" xref="mal_list"/>
@@ -18,4 +18,4 @@ mal_list_bullet = element_list {
   } +
 }</code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_list_definition.xml b/sandbox/mallard/spec/mal_list_definition.xml
index 0bbe172..fed0c32 100644
--- a/sandbox/mallard/spec/mal_list_definition.xml
+++ b/sandbox/mallard/spec/mal_list_definition.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_list_definition">
 <info>
   <link type="guide" xref="mal_list"/>
@@ -18,4 +18,4 @@ mal_list_definition = element_list {
   } +
 }</code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_list_numbered.xml b/sandbox/mallard/spec/mal_list_numbered.xml
index a579cb5..20f1e52 100644
--- a/sandbox/mallard/spec/mal_list_numbered.xml
+++ b/sandbox/mallard/spec/mal_list_numbered.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_list_numbered">
 <info>
   <link type="guide" xref="mal_list"/>
@@ -18,4 +18,4 @@ mal_list_numbered = element_list {
   } +,
 }</code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_list_tree.xml b/sandbox/mallard/spec/mal_list_tree.xml
index a4183b3..39d6116 100644
--- a/sandbox/mallard/spec/mal_list_tree.xml
+++ b/sandbox/mallard/spec/mal_list_tree.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_list_tree">
 <info>
   <link type="guide" xref="mal_list"/>
@@ -19,4 +19,4 @@ mal_item_tree = element item {
 }
 </code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_media.xml b/sandbox/mallard/spec/mal_media.xml
index 5574170..4b94d96 100644
--- a/sandbox/mallard/spec/mal_media.xml
+++ b/sandbox/mallard/spec/mal_media.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_media">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -8,4 +8,4 @@
 
 <title>Multimedia Objects</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_name.xml b/sandbox/mallard/spec/mal_name.xml
deleted file mode 100644
index a79030c..0000000
--- a/sandbox/mallard/spec/mal_name.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_name">
-<info>
-  <link type="guide" xref="mal_inline"/>
-</info>
-
-<title>Names</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_name = element name {
-  <link xref="mal_inline#simple">mal_inline_simple</link>+
-}
-</code></synopsis>
-
-<comment>
-  <cite><name>Shaun McCance</name><date>2007-01-30</date></cite>
-  <p>Add examples, processing expectations</p>
-</comment>
-
-</topic>
diff --git a/sandbox/mallard/spec/mal_note.xml b/sandbox/mallard/spec/mal_note.xml
index 6178ec7..64abb4c 100644
--- a/sandbox/mallard/spec/mal_note.xml
+++ b/sandbox/mallard/spec/mal_note.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_note">
 <info>
   <link type="guide" xref="mal_block#containers"/>
@@ -7,4 +7,4 @@
 
 <title>Notes</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_output.xml b/sandbox/mallard/spec/mal_output.xml
index 3d7ae7a..2e82d71 100644
--- a/sandbox/mallard/spec/mal_output.xml
+++ b/sandbox/mallard/spec/mal_output.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_output">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -8,4 +8,4 @@
 
 <title>Computer Output</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_p.xml b/sandbox/mallard/spec/mal_p.xml
index 135359b..4630392 100644
--- a/sandbox/mallard/spec/mal_p.xml
+++ b/sandbox/mallard/spec/mal_p.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_p">
 <info>
   <link type="guide" xref="mal_block#simple"/>
@@ -60,4 +60,4 @@ outout.</p>
 </section>
 <!-- END docbook -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_quote.xml b/sandbox/mallard/spec/mal_quote.xml
index eed644c..d8cde0e 100644
--- a/sandbox/mallard/spec/mal_quote.xml
+++ b/sandbox/mallard/spec/mal_quote.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_quote">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -14,4 +14,4 @@
   <p>style="epipgraph"</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_screen.xml b/sandbox/mallard/spec/mal_screen.xml
index df7aaf9..77b43ba 100644
--- a/sandbox/mallard/spec/mal_screen.xml
+++ b/sandbox/mallard/spec/mal_screen.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_screen">
 <info>
   <link type="guide" xref="mal_block#simple"/>
@@ -19,4 +19,4 @@ mal_screen = element screen {
   <p>Add intro, examples, and processing expectations.</p>
 </comment>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_section.xml b/sandbox/mallard/spec/mal_section.xml
index c8de58a..008a75e 100644
--- a/sandbox/mallard/spec/mal_section.xml
+++ b/sandbox/mallard/spec/mal_section.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_section">
 <info>
   <link type="guide" xref="spec_pages" weight="-1"/>
@@ -7,4 +7,4 @@
 
 <title>Sections</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_subtitle.xml b/sandbox/mallard/spec/mal_subtitle.xml
index b65623e..5a92922 100644
--- a/sandbox/mallard/spec/mal_subtitle.xml
+++ b/sandbox/mallard/spec/mal_subtitle.xml
@@ -1,2 +1,2 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard">
-</topic>
+<page xmlns="http://www.gnome.org/~shaunm/mallard">
+</page>
diff --git a/sandbox/mallard/spec/mal_synopsis.xml b/sandbox/mallard/spec/mal_synopsis.xml
index 301bb3e..a74f750 100644
--- a/sandbox/mallard/spec/mal_synopsis.xml
+++ b/sandbox/mallard/spec/mal_synopsis.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_synopsis">
 <info>
   <link type="guide" xref="mal_block#containers"/>
@@ -40,4 +40,4 @@ control element.</p>
   title using font variations or other stylistic means.</p>
 </section>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_sys.xml b/sandbox/mallard/spec/mal_sys.xml
index 41660c7..8547167 100644
--- a/sandbox/mallard/spec/mal_sys.xml
+++ b/sandbox/mallard/spec/mal_sys.xml
@@ -1,5 +1,5 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_sys">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      id="mal_sys">
 <info>
   <link type="guide" xref="mal_inline"/>
   <link type="seealso" xref="mal_link#ubiquitous"/>
@@ -8,4 +8,4 @@
 
 <title>System Items</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_table.xml b/sandbox/mallard/spec/mal_table.xml
index e1520ec..c5bef12 100644
--- a/sandbox/mallard/spec/mal_table.xml
+++ b/sandbox/mallard/spec/mal_table.xml
@@ -1,5 +1,5 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_table">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      id="mal_table">
 <info>
   <link type="guide" xref="mal_block#containers"/>
 </info>
@@ -776,4 +776,4 @@ mal_table = element table {
 </section>
 <!-- END docbook -->
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_title.xml b/sandbox/mallard/spec/mal_title.xml
index b65623e..5a92922 100644
--- a/sandbox/mallard/spec/mal_title.xml
+++ b/sandbox/mallard/spec/mal_title.xml
@@ -1,2 +1,2 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard">
-</topic>
+<page xmlns="http://www.gnome.org/~shaunm/mallard">
+</page>
diff --git a/sandbox/mallard/spec/mal_topic.xml b/sandbox/mallard/spec/mal_topic.xml
deleted file mode 100644
index c2b3d83..0000000
--- a/sandbox/mallard/spec/mal_topic.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_topic">
-<info>
-  <link type="guide" xref="spec_pages"/>
-  <version number="0.1" date="2007-02-21" status="stub"/>
-</info>
-
-<title>Topic Pages</title>
-
-<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_topic = element topic {
-  element info {
-    <link xref="mal_credit">mal_credit</link> *       &amp;
-    <link xref="mal_copyright">mal_copyright</link> *    &amp;
-    <link xref="mal_desc">mal_desc</link> ?         &amp;
-    <link xref="mal_license">mal_license</link> *      &amp;
-    <link xref="mal_link#guide">mal_link_guide</link> *   &amp;
-    <link xref="mal_link#seealso">mal_link_seealso</link> * &amp;
-    <link xref="mal_version">mal_version</link> *
-  } ?,
-  <link xref="mal_title">mal_title</link>,
-  <link xref="mal_block">mal_block</link>+,
-  <link xref="mal_section">mal_section_topic</link>*
-}</code></synopsis>
-
-<comment>
-  <cite><name>Shaun McCance</name><date>2007-01-30</date></cite>
-  <p>Add some intro text, examples, processing expectations.</p>
-</comment>
-
-</topic>
diff --git a/sandbox/mallard/spec/mal_var.xml b/sandbox/mallard/spec/mal_var.xml
index fd5139d..bc94f0f 100644
--- a/sandbox/mallard/spec/mal_var.xml
+++ b/sandbox/mallard/spec/mal_var.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="mal_var">
 <info>
   <link type="guide" xref="mal_inline"/>
@@ -8,4 +8,4 @@
 
 <title>Variable Text</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mal_version.xml b/sandbox/mallard/spec/mal_version.xml
index 5368838..54e46c6 100644
--- a/sandbox/mallard/spec/mal_version.xml
+++ b/sandbox/mallard/spec/mal_version.xml
@@ -1,5 +1,5 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mal_version">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      id="mal_version">
 <info>
   <link type="guide" xref="spec_info"/>
   <version number="0.1" date="2007-02-22" status="stub"/>
@@ -17,4 +17,4 @@ mal_version = element version {
 }
 </code></synopsis>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/mallard.xml b/sandbox/mallard/spec/mallard.xml
index 777d48b..c2ee959 100644
--- a/sandbox/mallard/spec/mallard.xml
+++ b/sandbox/mallard/spec/mallard.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="mallard">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="mallard">
 <info>
   <link type="page" xref="10minutes"/>
   <link type="page" xref="explore"/>
@@ -16,4 +17,4 @@
   <p>Add some intro text</p>
 </comment>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/principle-guide.xml b/sandbox/mallard/spec/principle-guide.xml
index 2f45ad0..a2010a5 100644
--- a/sandbox/mallard/spec/principle-guide.xml
+++ b/sandbox/mallard/spec/principle-guide.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="principle-guide">
 <info>
   <version number="0.1" date="2007-02-26" status="stub"/>
@@ -8,4 +8,4 @@
 
 <title>Guide the Reader</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/principle-justenough.xml b/sandbox/mallard/spec/principle-justenough.xml
index 453eb07..489ef3d 100644
--- a/sandbox/mallard/spec/principle-justenough.xml
+++ b/sandbox/mallard/spec/principle-justenough.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="principle-justenough">
 <info>
   <version number="0.1" date="2007-02-26" status="stub"/>
@@ -9,4 +9,4 @@
 
 <title>Just Enough Markup</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/principle-redundancy.xml b/sandbox/mallard/spec/principle-redundancy.xml
index 43e85a7..536cb12 100644
--- a/sandbox/mallard/spec/principle-redundancy.xml
+++ b/sandbox/mallard/spec/principle-redundancy.xml
@@ -1,4 +1,4 @@
-<topic xmlns="http://www.gnome.org/~shaunm/mallard"
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
        id="principle-redundancy">
 <info>
   <version number="0.1" date="2007-02-26" status="stub"/>
@@ -8,4 +8,4 @@
 
 <title>Reduce Redundancy</title>
 
-</topic>
+</page>
diff --git a/sandbox/mallard/spec/principles.xml b/sandbox/mallard/spec/principles.xml
index 3ccf744..a9e83d5 100644
--- a/sandbox/mallard/spec/principles.xml
+++ b/sandbox/mallard/spec/principles.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="principles">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="principles">
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
   <desc>The guiding principles behind the design of Mallard</desc>
@@ -40,4 +41,4 @@
   <title>For the Hacker</title>
 </section>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/spec.xml b/sandbox/mallard/spec/spec.xml
index e0e9c86..198c5a0 100644
--- a/sandbox/mallard/spec/spec.xml
+++ b/sandbox/mallard/spec/spec.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="spec">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="spec">
 <info>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
@@ -11,4 +12,4 @@
   <p>Add some intro text</p>
 </comment>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/spec_info.xml b/sandbox/mallard/spec/spec_info.xml
index 984bd44..0c8a209 100644
--- a/sandbox/mallard/spec/spec_info.xml
+++ b/sandbox/mallard/spec/spec_info.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="spec_info">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="spec_info">
 <info>
   <link type="guide" xref="spec" weight="-1"/>
   <version number="0.1" date="2007-02-22" status="stub"/>
@@ -7,4 +8,4 @@
 
 <title>Information Elements</title>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/spec/spec_pages.xml b/sandbox/mallard/spec/spec_pages.xml
index 9caade9..752ffc8 100644
--- a/sandbox/mallard/spec/spec_pages.xml
+++ b/sandbox/mallard/spec/spec_pages.xml
@@ -1,5 +1,6 @@
-<guide xmlns="http://www.gnome.org/~shaunm/mallard"
-       id="spec_pages">
+<page xmlns="http://www.gnome.org/~shaunm/mallard"
+      type="guide"
+      id="spec_pages">
 <info>
   <link type="guide" xref="spec" weight="1"/>
   <version number="0.1" date="2007-02-22" status="stub"/>
@@ -12,4 +13,4 @@ default namespace = "http://www.gnome.org/~shaunm/mallard"
 start = (mal_guide | mal_topic)
 </code></synopsis>
 
-</guide>
+</page>
diff --git a/sandbox/mallard/xslt/mal2cache.xsl b/sandbox/mallard/xslt/mal2cache.xsl
index 81cb0ce..0d69a78 100644
--- a/sandbox/mallard/xslt/mal2cache.xsl
+++ b/sandbox/mallard/xslt/mal2cache.xsl
@@ -33,34 +33,20 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   </cache>
 </xsl:template>
 
-<xsl:template match="mal:topic">
+<xsl:template match="mal:page">
   <xsl:param name="href"/>
-  <topic>
+  <page>
     <xsl:attribute name="id">
       <xsl:value-of select="@id"/>
     </xsl:attribute>
     <xsl:attribute name="href">
       <xsl:value-of select="$href"/>
     </xsl:attribute>
-    <xsl:if test="not(mal:info)">
-      <xsl:call-template name="info">
-        <xsl:with-param name="info" select="mal:info"/>
-        <xsl:with-param name="node" select="."/>
-      </xsl:call-template>
+    <xsl:if test="@type">
+      <xsl:attribute name="type">
+        <xsl:value-of select="@type"/>
+      </xsl:attribute>
     </xsl:if>
-    <xsl:apply-templates/>
-  </topic>
-</xsl:template>
-
-<xsl:template match="mal:guide">
-  <xsl:param name="href"/>
-  <guide>
-    <xsl:attribute name="id">
-      <xsl:value-of select="@id"/>
-    </xsl:attribute>
-    <xsl:attribute name="href">
-      <xsl:value-of select="$href"/>
-    </xsl:attribute>
     <xsl:if test="not(mal:info)">
       <xsl:call-template name="info">
         <xsl:with-param name="info" select="mal:info"/>
@@ -68,7 +54,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       </xsl:call-template>
     </xsl:if>
     <xsl:apply-templates/>
-  </guide>
+  </page>
 </xsl:template>
 
 <xsl:template match="mal:section">
diff --git a/sandbox/mallard/xslt/mal2html-page.xsl b/sandbox/mallard/xslt/mal2html-page.xsl
index 895b34a..ab65ff0 100644
--- a/sandbox/mallard/xslt/mal2html-page.xsl
+++ b/sandbox/mallard/xslt/mal2html-page.xsl
@@ -31,7 +31,7 @@ REMARK: Describe this module
 <!--**==========================================================================
 mal2html.page.copyright
 Outputs the copyright notice at the bottom of a page
-$node: The top-level #{topic} or #{guide} element
+$node: The top-level #{page} element
 
 REMARK: Describe this template
 -->
@@ -51,7 +51,7 @@ REMARK: Describe this template
 <!--**==========================================================================
 mal2html.page.guidelinks
 Outputs the automatic links from a page to guide pages and sections
-$node: The #{topic}, #{guide}, or #{section} element containing the links
+$node: The #{page} or #{section} element containing the links
 
 REMARK: Describe this template
 -->
@@ -60,7 +60,7 @@ REMARK: Describe this template
   <xsl:variable name="id">
     <xsl:choose>
       <xsl:when test="$node/self::mal:section">
-        <xsl:value-of select="concat((ancestor::mal:guide[1] | ancestor::mal:topic[1])[1]/@id, '#', @id)"/>
+        <xsl:value-of select="concat(ancestor::mal:page[1]/@id, '#', @id)"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="@id"/>
@@ -129,14 +129,13 @@ REMARK: Describe this template
       </xsl:for-each>
     </ul>
   </xsl:if>
-  <!-- END guidelinks -->
 </xsl:template>
 
 
 <!--**==========================================================================
 mal2html.page.guidelink
 Outputs an automatic link block from a page or section to a guide
-$node: The #{topic}, #{guide}, or #{section} element containing the link
+$node: The #{page} or #{section} element containing the link
 $page: The element from the cache file of the page being linked to
 $position: The position of this link in the list, either 'first', 'last', or ''
 
@@ -149,7 +148,7 @@ REMARK: Describe this template
   <xsl:variable name="xref">
     <xsl:choose>
       <xsl:when test="$page/self::mal:section">
-        <xsl:value-of select="($page/ancestor::mal:guide | $page/ancestor::mal:topic)[1]/@id"/>
+        <xsl:value-of select="$page/ancestor::mal:page[1]/@id"/>
         <xsl:text>#</xsl:text>
         <xsl:value-of select="$page/@id"/>
       </xsl:when>
@@ -191,7 +190,7 @@ REMARK: Describe this template
 <!--**==========================================================================
 mal2html.page.pagelinks
 Outputs the automatic links from a guide page or guide section
-$node: The #{guide} or #{section} element containing the links
+$node: The #{page} or #{section} element containing the links
 
 REMARK: Describe this template
 -->
@@ -200,7 +199,7 @@ REMARK: Describe this template
   <xsl:variable name="id">
     <xsl:choose>
       <xsl:when test="$node/self::mal:section">
-        <xsl:value-of select="concat(ancestor::mal:guide[1]/@id, '#', @id)"/>
+        <xsl:value-of select="concat(ancestor::mal:page[1]/@id, '#', @id)"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="@id"/>
@@ -292,7 +291,7 @@ REMARK: Describe this template
   <xsl:variable name="xref">
     <xsl:choose>
       <xsl:when test="$page/self::mal:section">
-        <xsl:value-of select="($page/ancestor::mal:guide | $page/ancestor::mal:topic)[1]/@id"/>
+        <xsl:value-of select="$page/ancestor::mal:page[1]/@id"/>
         <xsl:text>#</xsl:text>
         <xsl:value-of select="$page/@id"/>
       </xsl:when>
@@ -366,7 +365,7 @@ REMARK: Describe this template
   <xsl:variable name="id">
     <xsl:choose>
       <xsl:when test="$node/self::mal:section">
-        <xsl:value-of select="concat(ancestor::mal:topic[1]/@id, '#', @id)"/>
+        <xsl:value-of select="concat(ancestor::mal:page[1]/@id, '#', @id)"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="@id"/>
@@ -455,7 +454,7 @@ REMARK: Describe this template
   <xsl:variable name="xref">
     <xsl:choose>
       <xsl:when test="$page/self::mal:section">
-        <xsl:value-of select="($page/ancestor::mal:guide | $page/ancestor::mal:topic)[1]/@id"/>
+        <xsl:value-of select="$page/ancestor::mal:page[1]/@id"/>
         <xsl:text>#</xsl:text>
         <xsl:value-of select="$page/@id"/>
       </xsl:when>
@@ -495,34 +494,6 @@ REMARK: Describe this template
 
 
 <!--**==========================================================================
-mal2html.page.sidebar
-Outputs the sidebar for a structural element
-$node: A #{topic}, #{guide}, or #{section} element
-
-REMARK: Describe this template
--->
-<xsl:template name="mal2html.page.sidebar">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="guidelinks">
-    <xsl:call-template name="mal2html.page.guidelinks">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="seealsolinks">
-    <xsl:call-template name="mal2html.page.seealsolinks">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$guidelinks or $seealsolinks">
-    <div class="sidebar">
-      <xsl:copy-of select="$guidelinks"/>
-      <xsl:copy-of select="$seealsolinks"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-
-<!--**==========================================================================
 mal2html.page.css
 Outputs CSS that controls the appearance of page elements
 
@@ -650,7 +621,6 @@ div.pagelink:hover {
   </xsl:call-template>
   <xsl:text>;
 }
-div.sidebar { margin: 0; }
 ul.guidelinks {
   display: block;
   margin: 0;
@@ -668,13 +638,6 @@ li.guidelink::before {
 li.guidelink-first::before, li.guidelink-only::before {
   content: '';
 }
-
-
-div.sidebar div.title {
-  font-size: 1em;
-  font-weight: normal;
-  display: inline;
-}
 div.seealsolinks { margin: 0; }
 div.seealsolink {
   display: inline;
@@ -700,7 +663,7 @@ div.seealsolink-first::before, div.seealsolink-only::before {
 <xsl:template match="/">
   <!-- FIXME: find a way to just select the version element -->
   <xsl:variable name="date">
-    <xsl:for-each select="*/mal:info/mal:version">
+    <xsl:for-each select="mal:page/mal:info/mal:version">
       <xsl:sort select="@date" data-type="text" order="descending"/>
       <xsl:if test="position() = 1">
         <xsl:value-of select="@date"/>
@@ -708,11 +671,11 @@ div.seealsolink-first::before, div.seealsolink-only::before {
     </xsl:for-each>
   </xsl:variable>
   <xsl:variable name="version"
-                select="*/mal:info/mal:version[@date = $date][last()]"/>
+                select="mal:page/mal:info/mal:version[@date = $date][last()]"/>
   <html>
     <head>
       <title>
-        <xsl:value-of select="/*/mal:title"/>
+        <xsl:value-of select="mal:page/mal:title"/>
       </title>
       <xsl:call-template name="mal2html.css"/>
     </head>
@@ -754,42 +717,34 @@ div.seealsolink-first::before, div.seealsolink-only::before {
         </div>
       </xsl:if>
       <div class="body">
-        <xsl:apply-templates/>
+        <xsl:apply-templates select="mal:page"/>
       </div>
       <xsl:call-template name="db2html.page.copyrights">
-        <xsl:with-param name="node" select="mal:topic | mal:guide"/>
+        <xsl:with-param name="node" select="mal:page"/>
       </xsl:call-template>
     </body>
   </html>
 </xsl:template>
 
 <!-- = guide = -->
-<xsl:template match="mal:guide">
-  <div class="header">
-    <xsl:apply-templates mode="mal2html.block.mode"
-                         select="mal:title | mal:subtitle"/>
-  </div>
-  <xsl:call-template name="mal2html.page.sidebar"/>
-  <div class="contents">
-    <xsl:apply-templates
-        mode="mal2html.block.mode"
-        select="*[not(self::mal:section | self::mal:title | self::mal:subtitle)]"/>
-    <xsl:call-template name="mal2html.page.pagelinks"/>
-  </div>
-  <xsl:apply-templates select="mal:section"/>
-</xsl:template>
-
-<!-- = topic = -->
-<xsl:template match="mal:topic">
+<xsl:template match="mal:page">
   <div class="header">
     <xsl:apply-templates mode="mal2html.block.mode"
                          select="mal:title | mal:subtitle"/>
   </div>
-  <xsl:call-template name="mal2html.page.sidebar"/>
+  <xsl:call-template name="mal2html.page.guidelinks">
+    <xsl:with-param name="node" select="."/>
+  </xsl:call-template>
+  <xsl:call-template name="mal2html.page.seealsolinks">
+    <xsl:with-param name="node" select="."/>
+  </xsl:call-template>
   <div class="contents">
     <xsl:apply-templates
         mode="mal2html.block.mode"
         select="*[not(self::mal:section | self::mal:title | self::mal:subtitle)]"/>
+    <xsl:if test="@type = 'guide'">
+      <xsl:call-template name="mal2html.page.pagelinks"/>
+    </xsl:if>
   </div>
   <xsl:apply-templates select="mal:section"/>
 </xsl:template>
@@ -801,12 +756,17 @@ div.seealsolink-first::before, div.seealsolink-only::before {
       <xsl:apply-templates mode="mal2html.block.mode"
                            select="mal:title | mal:subtitle"/>
     </div>
-    <xsl:call-template name="mal2html.page.sidebar"/>
+    <xsl:call-template name="mal2html.page.guidelinks">
+      <xsl:with-param name="node" select="."/>
+    </xsl:call-template>
+    <xsl:call-template name="mal2html.page.seealsolinks">
+      <xsl:with-param name="node" select="."/>
+    </xsl:call-template>
     <div class="contents">
       <xsl:apply-templates
           mode="mal2html.block.mode"
           select="*[not(self::mal:section | self::mal:title | self::mal:subtitle)]"/>
-      <xsl:if test="ancestor::mal:guide">
+      <xsl:if test="/mal:page/@type = 'guide'">
         <xsl:call-template name="mal2html.page.pagelinks"/>
       </xsl:if>
     </div>
diff --git a/sandbox/mallard/xslt/mal2html.xsl b/sandbox/mallard/xslt/mal2html.xsl
index bdfb4a6..cbe3ac6 100644
--- a/sandbox/mallard/xslt/mal2html.xsl
+++ b/sandbox/mallard/xslt/mal2html.xsl
@@ -44,9 +44,7 @@ REMARK: Describe this module
 <xsl:param name="mal.cache_file"/>
 <xsl:variable name="cache" select="document($mal.cache_file)"/>
 <xsl:key name="cache_key" match="*[@id]"
-         use="concat(
-              (ancestor-or-self::mal:guide | ancestor-or-self::mal:topic)[last()]/@id,
-              '#', @id)"/>
+         use="concat(ancestor-or-self::mal:page[1]/@id, '#', @id)"/>
 
 <!-- FIXME -->
 <xsl:template match="*">