GNOME.org
 

[gnome-doc-utils] [mallard] Fixing various validity issues

commit 4d400ee5cc50f0c55bd699e234c8beafa7a465b2
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Jun 27 18:51:11 2009 -0500

    [mallard] Fixing various validity issues

 doc/mallard/C/explore.page            |    2 +-
 doc/mallard/C/index.page              |    2 +-
 doc/mallard/C/legal.xml               |    2 +-
 doc/mallard/C/mal_attr_link.page      |    2 +-
 doc/mallard/C/mal_block_cite.page     |    6 ++--
 doc/mallard/C/mal_block_media.page    |    4 +-
 doc/mallard/C/mal_block_screen.page   |    4 +-
 doc/mallard/C/mal_block_synopsis.page |    2 +-
 doc/mallard/C/mal_external.page       |    2 +-
 doc/mallard/C/mal_inline.page         |   37 +++++++++++++++++----------------
 doc/mallard/C/mal_inline_app.page     |    8 +++---
 doc/mallard/C/mal_inline_cmd.page     |    4 +-
 doc/mallard/C/mal_inline_media.page   |    4 +-
 doc/mallard/C/mal_inline_span.page    |    6 ++--
 doc/mallard/C/mal_table.page          |    4 +-
 doc/mallard/C/mal_table_td.page       |    2 +
 doc/mallard/C/principles.page         |    4 +-
 doc/mallard/C/spec.page               |    2 +-
 18 files changed, 50 insertions(+), 47 deletions(-)
---
diff --git a/doc/mallard/C/explore.page b/doc/mallard/C/explore.page
index 77fd23c..89c691c 100644
--- a/doc/mallard/C/explore.page
+++ b/doc/mallard/C/explore.page
@@ -22,7 +22,7 @@
 <title>Explore Mallard</title>
 
 <comment>
-  <cite date="2007-02-22"><name>Shaun McCance</name></cite>
+  <cite date="2007-02-22">Shaun McCance</cite>
   <p>Add content</p>
 </comment>
 
diff --git a/doc/mallard/C/index.page b/doc/mallard/C/index.page
index 72c6745..9aa27ad 100644
--- a/doc/mallard/C/index.page
+++ b/doc/mallard/C/index.page
@@ -26,7 +26,7 @@
 <title>Mallard</title>
 
 <comment>
-  <cite date="2007-02-20"><name>Shaun McCance</name></cite>
+  <cite date="2007-02-20">Shaun McCance</cite>
   <p>Add some intro text</p>
 </comment>
 
diff --git a/doc/mallard/C/legal.xml b/doc/mallard/C/legal.xml
index 8ded66f..6f643be 100644
--- a/doc/mallard/C/legal.xml
+++ b/doc/mallard/C/legal.xml
@@ -1,4 +1,4 @@
-<license xmlns="http://www.gnome.org/~shaunm/mallard";
+<license xmlns="http://projectmallard.org/1.0/";
          href="http://creativecommons.org/licenses/by-sa/3.0/us/";>
 <p>This work is licensed under a
 <link href="http://creativecommons.org/licenses/by-sa/3.0/us/";>Creative Commons
diff --git a/doc/mallard/C/mal_attr_link.page b/doc/mallard/C/mal_attr_link.page
index ac392a6..2b7ed1f 100644
--- a/doc/mallard/C/mal_attr_link.page
+++ b/doc/mallard/C/mal_attr_link.page
@@ -29,7 +29,7 @@ mal_attr_link =
 </code></synopsis>
 
 <comment>
-  <cite date="2006-11-16"><name>Shaun McCance</name></cite>
+  <cite date="2006-11-16">Shaun McCance</cite>
   <p>The content model is perhaps not as clearly expressed as it could be.
   The <code>ref</code> attribute may need to be renamed.  The idea is that
   we can have a reference to a document within a help system, with a defined
diff --git a/doc/mallard/C/mal_block_cite.page b/doc/mallard/C/mal_block_cite.page
index d16f537..279888b 100644
--- a/doc/mallard/C/mal_block_cite.page
+++ b/doc/mallard/C/mal_block_cite.page
@@ -25,7 +25,7 @@
 mal_block_cite = element cite {
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
-  attribute date { xsd:date } ?,
+  attribute date { text } ?,
   attribute href { text } ?,
 
   <link xref="mal_inline">mal_inline</link>
@@ -33,7 +33,7 @@ mal_block_cite = element cite {
 </code></synopsis>
 
 <comment>
-  <cite date="2007-02-08"><name>Shaun McCance</name></cite>
+  <cite date="2007-02-08">Shaun McCance</cite>
   <p>Possibly add source for block quote citations.</p>
 </comment>
 
@@ -42,7 +42,7 @@ mal_block_cite = element cite {
 element.</p>
 
 <comment>
-  <cite date="2007-02-08"><name>Shaun McCance</name></cite>
+  <cite date="2007-02-08">Shaun McCance</cite>
   <p>Add examples, processing expectations.</p>
 </comment>
 
diff --git a/doc/mallard/C/mal_block_media.page b/doc/mallard/C/mal_block_media.page
index 2c1036a..a966a74 100644
--- a/doc/mallard/C/mal_block_media.page
+++ b/doc/mallard/C/mal_block_media.page
@@ -28,8 +28,8 @@ mal_block_media = element media {
   attribute type { "image" | "video" | "audio" | "application" } ?,
   attribute mime { text } ?,
   attribute src { text },
-  attribute height { text },
-  attribute width { text },
+  attribute height { text } ?,
+  attribute width { text } ?,
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
 
diff --git a/doc/mallard/C/mal_block_screen.page b/doc/mallard/C/mal_block_screen.page
index e169aa0..6e3324e 100644
--- a/doc/mallard/C/mal_block_screen.page
+++ b/doc/mallard/C/mal_block_screen.page
@@ -75,10 +75,10 @@ by the user.</p>
       <p>Typical values for the <code>mime</code> attribute include:</p>
       <table rules="rows"><tr>
         <td><p><code>application/x-sh</code></p></td>
-        <td>Command to execute with the Bourne shell</td>
+        <td><p>Command to execute with the Bourne shell</p></td>
       </tr><tr>
         <td><p><code>application/x-csh</code></p></td>
-        <td>Command to execute with the C shell</td>
+        <td><p>Command to execute with the C shell</p></td>
       </tr></table>
     </item>
 
diff --git a/doc/mallard/C/mal_block_synopsis.page b/doc/mallard/C/mal_block_synopsis.page
index 0b2da7b..d9401c8 100644
--- a/doc/mallard/C/mal_block_synopsis.page
+++ b/doc/mallard/C/mal_block_synopsis.page
@@ -41,7 +41,7 @@ material, or for enumerating the items in a menu or other graphical
 control element.</p>
 
 <comment>
-  <cite date="2006-11-16"><name>Shaun McCance</name></cite>
+  <cite date="2006-11-16">Shaun McCance</cite>
   <p>Add explanation, examples</p>
 </comment>
 
diff --git a/doc/mallard/C/mal_external.page b/doc/mallard/C/mal_external.page
index 7ec119d..bdf2f75 100644
--- a/doc/mallard/C/mal_external.page
+++ b/doc/mallard/C/mal_external.page
@@ -23,7 +23,7 @@
 <title>External Namespaces</title>
 
 <comment>
-  <cite date="2008-12-01"><name>Shaun McCance</name></cite>
+  <cite date="2008-12-01">Shaun McCance</cite>
   <p>Add content</p>
 </comment>
 
diff --git a/doc/mallard/C/mal_inline.page b/doc/mallard/C/mal_inline.page
index e064840..a2418f5 100644
--- a/doc/mallard/C/mal_inline.page
+++ b/doc/mallard/C/mal_inline.page
@@ -24,24 +24,25 @@
 <title>Inline Elements</title>
 
 <synopsis><code mime="application/relax-ng-compact-syntax">
-mal_inline = mixed {
-  <link xref="mal_inline_app">mal_inline_app</link> *,
-  <link xref="mal_inline_cmd">mal_inline_cmd</link> *,
-  <link xref="mal_inline_code">mal_inline_code</link> *,
-  <link xref="mal_inline_em">mal_inline_em</link> *,
-  <link xref="mal_inline_file">mal_inline_file</link> *,
-  <link xref="mal_inline_gui">mal_inline_gui</link> *,
-  <link xref="mal_inline_guiseq">mal_inline_guiseq</link> *,
-  <link xref="mal_inline_input">mal_inline_input</link> *,
-  <link xref="mal_inline_key">mal_inline_key</link> *,
-  <link xref="mal_inline_keyseq">mal_inline_keyseq</link> *,
-  <link xref="mal_inline_link">mal_inline_link</link> *,
-  <link xref="mal_inline_media">mal_inline_media</link> *,
-  <link xref="mal_inline_output">mal_inline_output</link> *,
-  <link xref="mal_inline_span">mal_inline_span</link> *,
-  <link xref="mal_inline_sys">mal_inline_sys</link> *,
-  <link xref="mal_inline_var">mal_inline_var</link> *,
-  element * - (mal:* | local:*) { mal_inline } *
+mal_inline = {
+  <link xref="mal_inline_app">mal_inline_app</link> * &amp;
+  <link xref="mal_inline_cmd">mal_inline_cmd</link> * &amp;
+  <link xref="mal_inline_code">mal_inline_code</link> * &amp;
+  <link xref="mal_inline_em">mal_inline_em</link> * &amp;
+  <link xref="mal_inline_file">mal_inline_file</link> * &amp;
+  <link xref="mal_inline_gui">mal_inline_gui</link> * &amp;
+  <link xref="mal_inline_guiseq">mal_inline_guiseq</link> * &amp;
+  <link xref="mal_inline_input">mal_inline_input</link> * &amp;
+  <link xref="mal_inline_key">mal_inline_key</link> * &amp;
+  <link xref="mal_inline_keyseq">mal_inline_keyseq</link> * &amp;
+  <link xref="mal_inline_link">mal_inline_link</link> * &amp;
+  <link xref="mal_inline_media">mal_inline_media</link> * &amp;
+  <link xref="mal_inline_output">mal_inline_output</link> * &amp;
+  <link xref="mal_inline_span">mal_inline_span</link> * &amp;
+  <link xref="mal_inline_sys">mal_inline_sys</link> * &amp;
+  <link xref="mal_inline_var">mal_inline_var</link> * &amp;
+  element * - (mal:* | local:*) { mal_inline } * &amp;
+  text ?
 }
 </code></synopsis>
 
diff --git a/doc/mallard/C/mal_inline_app.page b/doc/mallard/C/mal_inline_app.page
index e568400..37f9ec2 100644
--- a/doc/mallard/C/mal_inline_app.page
+++ b/doc/mallard/C/mal_inline_app.page
@@ -108,10 +108,10 @@ your desktop.
   be a title.</p>
 
   <p>For example, the calculator application that comes with Gnome is called
-  <app>Calculator</app>.  If an author were to write <quote>To start
-  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>
+  <app>Calculator</app>.  If an author were to write â??To start Calculatorâ?¦â??,
+  then a reader may confuse this for â??To start the calculatorâ?¦â?? with an error.
+  This is even more pronounced in languages such as German where nouns are
+  always capitalized.</p>
 
   <p>For this reason, it is recommended that application names marked with the
   <code>app</code> element are rendered in italics or using some other font
diff --git a/doc/mallard/C/mal_inline_cmd.page b/doc/mallard/C/mal_inline_cmd.page
index 77530a4..91a0c93 100644
--- a/doc/mallard/C/mal_inline_cmd.page
+++ b/doc/mallard/C/mal_inline_cmd.page
@@ -79,10 +79,10 @@ by the user.</p>
       <p>Typical values for the <code>mime</code> attribute include:</p>
       <table rules="rows"><tr>
         <td><p><code>application/x-sh</code></p></td>
-        <td>Command to execute with the Bourne shell</td>
+        <td><p>Command to execute with the Bourne shell</p></td>
       </tr><tr>
         <td><p><code>application/x-csh</code></p></td>
-        <td>Command to execute with the C shell</td>
+        <td><p>Command to execute with the C shell</p></td>
       </tr></table>
     </item>
 
diff --git a/doc/mallard/C/mal_inline_media.page b/doc/mallard/C/mal_inline_media.page
index d1ca399..0e001ce 100644
--- a/doc/mallard/C/mal_inline_media.page
+++ b/doc/mallard/C/mal_inline_media.page
@@ -30,8 +30,8 @@ mal_inline_media = element media {
   attribute type { "image" | "video" | "audio" | "application" } ?,
   attribute mime { text } ?,
   attribute src { text },
-  attribute height { text },
-  attribute width { text },
+  attribute height { text } ?,
+  attribute width { text } ?,
   attribute * - (mal:* | local:*) { text } *,
 
   <link xref="mal_inline">mal_inline</link>
diff --git a/doc/mallard/C/mal_inline_span.page b/doc/mallard/C/mal_inline_span.page
index 046640e..d849632 100644
--- a/doc/mallard/C/mal_inline_span.page
+++ b/doc/mallard/C/mal_inline_span.page
@@ -79,9 +79,9 @@ using attributes from external namespaces.</p>
 
   <example>
     <code><![CDATA[
-This <phrase its:translate="no">word</phrase> should not be translated.]]></code>
-    <p>This <phrase xmlns:its="http://www.w3.org/2005/11/its"; its:version="1.0"
-    its:translate="no">word</phrase> should not be translated.</p>
+This <span its:translate="no">word</span> should not be translated.]]></code>
+    <p>This <span xmlns:its="http://www.w3.org/2005/11/its"; its:version="1.0"
+    its:translate="no">word</span> should not be translated.</p>
   </example>
 </section>
 <!-- END examples -->
diff --git a/doc/mallard/C/mal_table.page b/doc/mallard/C/mal_table.page
index 5a17c9c..9b9abac 100644
--- a/doc/mallard/C/mal_table.page
+++ b/doc/mallard/C/mal_table.page
@@ -156,7 +156,7 @@ mal_table = element table {
 
   <example>
   <code><![CDATA[
-<table frame="all" rules="rowgroups columns">
+<table frame="all" rules="rowgroups cols">
   <tbody>
     <tr>
       <td><p>Mallard</p></td>  <td><p>Anas platyrhynchos</p></td>
@@ -178,7 +178,7 @@ mal_table = element table {
     </tr>
   </tbody>
 </table>]]></code>
-  <table frame="all" rules="rowgroups columns">
+  <table frame="all" rules="rowgroups cols">
     <tbody>
       <tr>
         <td><p>Mallard</p></td>  <td><p>Anas platyrhynchos</p></td>
diff --git a/doc/mallard/C/mal_table_td.page b/doc/mallard/C/mal_table_td.page
index 3cc22d5..54b4868 100644
--- a/doc/mallard/C/mal_table_td.page
+++ b/doc/mallard/C/mal_table_td.page
@@ -12,6 +12,8 @@
 mal_table_td = element td {
   attribute style { xsd:NMTOKENS } ?,
   attribute * - (mal:* | local:*) { text } *,
+  attribute rowspan { text } ?,
+  attribute colspan { text } ?,
 
   <link xref="mal_block">mal_block</link> +
 }
diff --git a/doc/mallard/C/principles.page b/doc/mallard/C/principles.page
index edcb32c..a1f6d9c 100644
--- a/doc/mallard/C/principles.page
+++ b/doc/mallard/C/principles.page
@@ -22,7 +22,7 @@
 <title>Design Principles</title>
 
 <comment>
-  <cite date="2008-11-10"><name>Shaun McCance</name></cite>
+  <cite date="2008-11-10">Shaun McCance</cite>
   <p>Add intro content</p>
   <p>Add principles: pluggability, implementation speed, l10n, digestible info</p>
 </comment>
@@ -46,7 +46,7 @@
   </info>
   <title>For the Writer</title>
   <comment>
-    <cite date="2007-02-27"><name>Shaun McCance</name></cite>
+    <cite date="2007-02-27">Shaun McCance</cite>
     <p>Add</p>
   </comment>
 </section>
diff --git a/doc/mallard/C/spec.page b/doc/mallard/C/spec.page
index 9b626b8..d1567b8 100644
--- a/doc/mallard/C/spec.page
+++ b/doc/mallard/C/spec.page
@@ -23,7 +23,7 @@
 <title>Language Specification</title>
 
 <comment>
-  <cite date="2007-02-20"><name>Shaun McCance</name></cite>
+  <cite date="2007-02-20">Shaun McCance</cite>
   <p>Add some intro text</p>
 </comment>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]