[gnome-doc-utils/mallard: 6/87] Fixing up links and markup, getting things working again

[Shaun McCance <shaunm src gnome org>]

commit 39c4b5bdd28d70a14ae19cbc4ac63aa4e6cb8b6e
Author: Shaun McCance <shaunm gnome org>
Date:   Thu Nov 6 08:43:24 2008 -0600

    Fixing up links and markup, getting things working again
---
 doc/mallard/C/10minutes.xml         |    2 --
 doc/mallard/C/explore.xml           |    2 --
 doc/mallard/C/mal_block_quote.xml   |    4 +++-
 doc/mallard/C/mal_info.xml          |    1 -
 doc/mallard/C/mal_inline_app.xml    |    3 ++-
 doc/mallard/C/mal_inline_cmd.xml    |    3 ++-
 doc/mallard/C/mal_inline_code.xml   |    3 ++-
 doc/mallard/C/mal_inline_output.xml |    3 ++-
 doc/mallard/C/mal_page.xml          |   19 +++++++++++++++----
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/doc/mallard/C/10minutes.xml b/doc/mallard/C/10minutes.xml
index 37a9ffa..80dc33a 100644
--- a/doc/mallard/C/10minutes.xml
+++ b/doc/mallard/C/10minutes.xml
@@ -4,8 +4,6 @@
 <info>
   <desc>Create a multiple-page document in only ten minutes</desc>
 
-  <link type="guide" xref="spec" weight="1"/>
-
   <credit type="author">
     <name>Shaun McCance</name>
     <email>shaunm gnome org</email>
diff --git a/doc/mallard/C/explore.xml b/doc/mallard/C/explore.xml
index 91a84f6..bc3f74c 100644
--- a/doc/mallard/C/explore.xml
+++ b/doc/mallard/C/explore.xml
@@ -3,8 +3,6 @@
 <info>
   <desc>Explore more of what Mallard has to offer</desc>
 
-  <link type="guide" xref="spec" weight="1"/>
-
   <credit type="author">
     <name>Shaun McCance</name>
     <email>shaunm gnome org</email>
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index 06d4701..f05e2b7 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.xml
@@ -1,7 +1,9 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-       id="mal_quote">
+      type="topic" id="mal_block_quote">
+
 <info>
   <link type="guide" xref="mal_block"/>
+  <link type="seealso" xref="mal_inline_quote"/>
   <version number="0.1" date="2007-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_info.xml b/doc/mallard/C/mal_info.xml
index 11c83fe..44233fe 100644
--- a/doc/mallard/C/mal_info.xml
+++ b/doc/mallard/C/mal_info.xml
@@ -2,7 +2,6 @@
       id="mal_info">
 
 <info>
-  <link type="guide" xref="spec_pages"/>
   <version number="0.1" date="2008-02-21" status="stub"/>
 </info>
 
diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml
index 3e1a99f..c10bf18 100644
--- a/doc/mallard/C/mal_inline_app.xml
+++ b/doc/mallard/C/mal_inline_app.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
+      type="topic"
       id="mal_inline_app">
 
 <info>
@@ -47,7 +48,7 @@ the name of the command used to run an application; use
 
   <p>For example, the calculator application that comes with Gnome is called
   <app>Calculator</app>.  If an author were to write <quote>To start
-  <app>Calculator</app>â?¦</quote>, then a reader may confuse this for <quote>To
+  Calculatorâ?¦</quote>, then a reader may confuse this for <quote>To
   start the calculatorâ?¦</quote> with an error.  This is even more pronounced
   in languages such as German where nouns are always capitalized.</p>
 
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml
index 9077488..6059332 100644
--- a/doc/mallard/C/mal_inline_cmd.xml
+++ b/doc/mallard/C/mal_inline_cmd.xml
@@ -1,9 +1,10 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
+      type="topic"
       id="mal_inline_cmd">
 
 <info>
   <link type="guide" xref="mal_inline"/>
-  <link type="seealso" xref="mal_screen"/>
+  <link type="seealso" xref="mal_block_screen"/>
   <link type="seealso" xref="mal_attr_link"/>
 
   <version number="0.1" date="2007-02-05" status="incomplete"/>
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml
index 0702413..e797a2c 100644
--- a/doc/mallard/C/mal_inline_code.xml
+++ b/doc/mallard/C/mal_inline_code.xml
@@ -1,5 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-       id="mal_inline_code">
+      type="topic"
+      id="mal_inline_code">
 
 <info>
   <link type="guide" xref="mal_inline"/>
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml
index 957efa7..2f5d831 100644
--- a/doc/mallard/C/mal_inline_output.xml
+++ b/doc/mallard/C/mal_inline_output.xml
@@ -1,5 +1,6 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-       id="mal_inline_output">
+      type="topic"
+      id="mal_inline_output">
 
 <info>
   <link type="guide" xref="mal_inline"/>
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml
index 081984f..163a795 100644
--- a/doc/mallard/C/mal_page.xml
+++ b/doc/mallard/C/mal_page.xml
@@ -1,17 +1,28 @@
 <page xmlns="http://www.gnome.org/~shaunm/mallard";
-       id="mal_page">
+      type="guide" id="mal_page">
 
 <info>
-  <link type="guide" xref="spec_pages"/>
   <version number="0.1" date="2008-02-21" status="stub"/>
 </info>
 
 <title>Pages</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_page = element page {
+namespace local = ""
+default namespace mal = "http://www.gnome.org/~shaunm/mallard";
+start = mal_page
+mal_page = (mal_page_guide | mal_page_topic)
+mal_page_guide = element page {
   attribute id { text },
-  attribute type { "topic" | "guide" } ?,
+  attribute type "guide",
+  <link xref="mal_info">mal_info</link>,
+  <link xref="mal_title">mal_title</link>,
+  <link xref="mal_block">mal_block</link> *,
+  <link xref="mal_section">mal_section</link> *
+}
+mal_page_topic = element page {
+  attribute id { text },
+  attribute type "topic",
   <link xref="mal_info">mal_info</link>,
   <link xref="mal_title">mal_title</link>,
   <link xref="mal_block">mal_block</link> *,