[gnome-doc-utils/mallard] [mallard] Moving mal_title to mal_block_title and mal_subtitle to mal_block_subtitle
- From: Shaun McCance <shaunm src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-doc-utils/mallard] [mallard] Moving mal_title to mal_block_title and mal_subtitle to mal_block_subtitle
- Date: Tue, 19 May 2009 19:45:58 -0400 (EDT)
commit c624f6f5172e014ffb7f42b9d237f92df379faa2
Author: Shaun McCance <shaunm gnome org>
Date: Tue May 19 13:54:28 2009 -0500
[mallard] Moving mal_title to mal_block_title and mal_subtitle to mal_block_subtitle
---
doc/mallard/C/mal_block.xml | 6 +++---
doc/mallard/C/mal_block_comment.xml | 6 +++---
doc/mallard/C/mal_block_dlist.xml | 2 +-
doc/mallard/C/mal_block_example.xml | 2 +-
doc/mallard/C/mal_block_figure.xml | 4 ++--
doc/mallard/C/mal_block_listing.xml | 4 ++--
doc/mallard/C/mal_block_note.xml | 4 ++--
doc/mallard/C/mal_block_olist.xml | 2 +-
doc/mallard/C/mal_block_quote.xml | 4 ++--
.../C/{mal_subtitle.xml => mal_block_subtitle.xml} | 4 ++--
doc/mallard/C/mal_block_synopsis.xml | 6 +++---
.../C/{mal_title.xml => mal_block_title.xml} | 4 ++--
doc/mallard/C/mal_block_ulist.xml | 2 +-
doc/mallard/C/mal_info_version.xml | 4 ++--
doc/mallard/C/mal_page.xml | 4 ++--
doc/mallard/C/mal_section.xml | 2 +-
doc/mallard/C/mal_table.xml | 2 +-
17 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/doc/mallard/C/mal_block.xml b/doc/mallard/C/mal_block.xml
index 32c2865..ab23075 100644
--- a/doc/mallard/C/mal_block.xml
+++ b/doc/mallard/C/mal_block.xml
@@ -97,7 +97,7 @@ mal_block_formal = (
<link xref="mal_block_synopsis">mal_block_synopsis</link>
)</code></synopsis>
- <p>Formal block elements contain a <link xref="mal_title">title</link>
+ <p>Formal block elements contain a <link xref="mal_block_title">title</link>
and general block content. Formal block elements allow you to provide
richer information in your pages.</p>
</section>
@@ -146,8 +146,8 @@ mal_block_list = (
<!-- BEGIN other -->
<section id="other">
<info>
- <link type="topic" xref="mal_title"/>
- <link type="topic" xref="mal_subtitle"/>
+ <link type="topic" xref="mal_block_title"/>
+ <link type="topic" xref="mal_block_subtitle"/>
<link type="topic" xref="mal_block_desc"/>
<link type="topic" xref="mal_block_cite"/>
</info>
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml
index 5a650f6..5654173 100644
--- a/doc/mallard/C/mal_block_comment.xml
+++ b/doc/mallard/C/mal_block_comment.xml
@@ -26,7 +26,7 @@ mal_block_comment = element comment {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_cite">mal_block_cite</link>,
<link xref="mal_block">mal_block</link> +
}
@@ -39,7 +39,7 @@ end reader. A <code>comment</code> element can contain other <code>comment</cod
elements, allowing you to have a threaded discussion inside editorial comments.</p>
<p>A <code>comment</code> element may optionally contain a
-<code xref="mal_title">title</code> element to provide a brief description
+<code xref="mal_block_title">title</code> element to provide a brief description
of the subject of the comment. Titles are encouraged in top-level comments,
although they are usually unnecessary in replies.</p>
@@ -53,7 +53,7 @@ to provide a <code>date</code> attribute.</p>
<title>Notes</title>
<list type="bullet">
<item><p>The <code>comment</code> element contains an optional
- <link xref="mal_title">title</link> element, a
+ <link xref="mal_block_title">title</link> element, a
<link xref="mal_block_cite">cite</link> element, and any
<link xref="mal_block">general block content</link>.</p></item>
diff --git a/doc/mallard/C/mal_block_dlist.xml b/doc/mallard/C/mal_block_dlist.xml
index c7a44c1..59f13f5 100644
--- a/doc/mallard/C/mal_block_dlist.xml
+++ b/doc/mallard/C/mal_block_dlist.xml
@@ -24,7 +24,7 @@ mal_list_definition = element list {
attribute type { "definition" },
attribute style { text } ?,
element item {
- <link xref="mal_title">mal_title</link> +,
+ <link xref="mal_block_title">mal_block_title</link> +,
<link xref="mal_block">mal_block</link> +,
<link xref="mal_list">mal_list</link> ?
} +
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.xml
index 9f6b8be..983ac4b 100644
--- a/doc/mallard/C/mal_block_example.xml
+++ b/doc/mallard/C/mal_block_example.xml
@@ -126,7 +126,7 @@ xsltproc -o mal_block_screen.html \
<code href="http://www.docbook.org/tdg/en/html/example.html">example</code>
element in DocBook. In DocBook, the <code>example</code> element is a
formal element. In Mallard, <code>example</code> is a simple container
- element, and does not allow a <code xref="mal_title">title</code>
+ element, and does not allow a <code xref="mal_block_title">title</code>
element.</p>
</section>
<!-- END comparison -->
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml
index a9ad7f1..24b937f 100644
--- a/doc/mallard/C/mal_block_figure.xml
+++ b/doc/mallard/C/mal_block_figure.xml
@@ -29,7 +29,7 @@ mal_block_figure = element figure {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_desc">mal_block_desc</link> ?,
<link xref="mal_block">mal_block</link> +
}
@@ -46,7 +46,7 @@ To provide a title for the contents of a file, such as a
<title>Notes</title>
<list type="bullet">
<item><p>The <code>figure</code> element contains an optional
- <link xref="mal_title">title</link> element, an optional
+ <link xref="mal_block_title">title</link> element, an optional
<link xref="mal_block_desc">desc</link> element, and any
<link xref="mal_block">general block content</link>.</p></item>
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.xml
index 646f9dd..ed3baa7 100644
--- a/doc/mallard/C/mal_block_listing.xml
+++ b/doc/mallard/C/mal_block_listing.xml
@@ -29,7 +29,7 @@ mal_block_listing = element listing {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_desc">mal_block_desc</link> ?,
<link xref="mal_block">mal_block</link> +
}
@@ -48,7 +48,7 @@ element.</p>
<title>Notes</title>
<list type="bullet">
<item><p>The <code>listing</code> element contains an optional
- <link xref="mal_title">title</link> element, an optional
+ <link xref="mal_block_title">title</link> element, an optional
<link xref="mal_block_desc">desc</link> element, and any
<link xref="mal_block">general block content</link>.</p></item>
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml
index 799b3b5..242b4f6 100644
--- a/doc/mallard/C/mal_block_note.xml
+++ b/doc/mallard/C/mal_block_note.xml
@@ -26,7 +26,7 @@ mal_block_note = element note {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block">mal_block</link> +
}
</code></synopsis>
@@ -44,7 +44,7 @@ of your document.</p>
<title>Notes</title>
<list type="bullet">
<item><p>The <code>note</code> element contains an optional
- <link xref="mal_title">title</link> element and any
+ <link xref="mal_block_title">title</link> element and any
<link xref="mal_block">general block content</link>.</p></item>
<item><p>The <code>note</code> element can occur in any
diff --git a/doc/mallard/C/mal_block_olist.xml b/doc/mallard/C/mal_block_olist.xml
index ac84f32..9c2dc62 100644
--- a/doc/mallard/C/mal_block_olist.xml
+++ b/doc/mallard/C/mal_block_olist.xml
@@ -23,7 +23,7 @@
mal_list_numbered = element list {
attribute type { "numbered" },
attribute style { text } ?,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
element item {
<link xref="mal_block">mal_block</link> +,
<link xref="mal_list">mal_list</link> ?
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml
index 841b5c2..8cee8d8 100644
--- a/doc/mallard/C/mal_block_quote.xml
+++ b/doc/mallard/C/mal_block_quote.xml
@@ -10,7 +10,7 @@
<synopsis><code mime="application/relax-ng-compact-syntax">
mal_block_quote = element quote {
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_cite">mal_block_cite</link>,
<link xref="mal_block">mal_block</link> +
}
@@ -27,7 +27,7 @@ mal_block_quote = element quote {
<title>Notes</title>
<list type="bullet">
<item><p>The <code>quote</code> element contains an optional
- <link xref="mal_title">title</link> element, a
+ <link xref="mal_block_title">title</link> element, a
<link xref="mal_block_cite">cite</link> element, and any
<link xref="mal_block">general block content</link>.</p></item>
diff --git a/doc/mallard/C/mal_subtitle.xml b/doc/mallard/C/mal_block_subtitle.xml
similarity index 81%
rename from doc/mallard/C/mal_subtitle.xml
rename to doc/mallard/C/mal_block_subtitle.xml
index 12cef6e..fa04571 100644
--- a/doc/mallard/C/mal_subtitle.xml
+++ b/doc/mallard/C/mal_block_subtitle.xml
@@ -1,6 +1,6 @@
<page xmlns="http://www.gnome.org/~shaunm/mallard"
type="topic"
- id="mal_subtitle">
+ id="mal_block_subtitle">
<info>
<version number="0.1" date="2007-02-21" status="stub"/>
@@ -9,7 +9,7 @@
<title>Subtitles</title>
<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_subtitle = element subtitle {
+mal_block_subtitle = element subtitle {
<link xref="mal_inline">mal_inline</link>
}
</code></synopsis>
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml
index 0673b2c..07a207f 100644
--- a/doc/mallard/C/mal_block_synopsis.xml
+++ b/doc/mallard/C/mal_block_synopsis.xml
@@ -26,7 +26,7 @@ mal_block_synopsis = element synopsis {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_desc">mal_block_desc</link> ?,
<link xref="mal_block">mal_block</link> +
}
@@ -49,7 +49,7 @@ control element.</p>
<title>Notes</title>
<list type="bullet">
<item><p>The <code>synopsis</code> element contains an optional
- <link xref="mal_title">title</link> element, an optional
+ <link xref="mal_block_title">title</link> element, an optional
<link xref="mal_block_desc">desc</link> element, and any
<link xref="mal_block">general block content</link>.</p></item>
@@ -110,7 +110,7 @@ int count_beans ();
it inside a colored box, with a border, or otherwise differently from
the surrounding text.</p>
- <p>If a <code xref="mal_title">title</code> element is provided, it
+ <p>If a <code xref="mal_block_title">title</code> element is provided, it
should appear at the top of the block and be clearly marked as the
title using font variations or other stylistic means.</p>
</section>
diff --git a/doc/mallard/C/mal_title.xml b/doc/mallard/C/mal_block_title.xml
similarity index 82%
rename from doc/mallard/C/mal_title.xml
rename to doc/mallard/C/mal_block_title.xml
index b11e797..3667410 100644
--- a/doc/mallard/C/mal_title.xml
+++ b/doc/mallard/C/mal_block_title.xml
@@ -1,6 +1,6 @@
<page xmlns="http://www.gnome.org/~shaunm/mallard"
type="topic"
- id="mal_title">
+ id="mal_block_title">
<info>
<version number="0.1" date="2007-02-21" status="stub"/>
@@ -9,7 +9,7 @@
<title>Titles</title>
<synopsis><code mime="application/relax-ng-compact-syntax">
-mal_title = element title {
+mal_block_title = element title {
<link xref="mal_inline">mal_inline</link>
}
</code></synopsis>
diff --git a/doc/mallard/C/mal_block_ulist.xml b/doc/mallard/C/mal_block_ulist.xml
index 56b478e..f575995 100644
--- a/doc/mallard/C/mal_block_ulist.xml
+++ b/doc/mallard/C/mal_block_ulist.xml
@@ -23,7 +23,7 @@
mal_list_bullet = element list {
attribute type { "bullet" } ?,
attribute style { text } ?,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
element item {
<link xref="mal_block">mal_block</link> +,
<link xref="mal_list">mal_list</link> ?
diff --git a/doc/mallard/C/mal_info_version.xml b/doc/mallard/C/mal_info_version.xml
index 2bcf20f..bc2c497 100644
--- a/doc/mallard/C/mal_info_version.xml
+++ b/doc/mallard/C/mal_info_version.xml
@@ -14,8 +14,8 @@ mal_info_version = element version {
attribute number { text } ?,
attribute date { xsd:date } ?,
attribute status { "stub" | "incomplete" | "draft" | "review" | "final" } ?,
- <link xref="mal_title">mal_title</link> ?,
- <link xref="mal_info_desc">mal_info_desc</link> ?
+ <link xref="mal_block_title">mal_block_title</link> ?,
+ <link xref="mal_block_desc">mal_block_desc</link> ?
}
</code></synopsis>
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml
index 7df9047..012892e 100644
--- a/doc/mallard/C/mal_page.xml
+++ b/doc/mallard/C/mal_page.xml
@@ -19,7 +19,7 @@ mal_page_guide = element page {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
<link xref="mal_info">mal_info</link>,
- <link xref="mal_title">mal_title</link>,
+ <link xref="mal_block_title">mal_block_title</link>,
<link xref="mal_block">mal_block</link> *,
<link xref="mal_section">mal_section</link> *
}
@@ -29,7 +29,7 @@ mal_page_topic = element page {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
<link xref="mal_info">mal_info</link>,
- <link xref="mal_title">mal_title</link>,
+ <link xref="mal_block_title">mal_block_title</link>,
<link xref="mal_block">mal_block</link> *,
<link xref="mal_section">mal_section</link> *
}
diff --git a/doc/mallard/C/mal_section.xml b/doc/mallard/C/mal_section.xml
index f239d19..b2c20da 100644
--- a/doc/mallard/C/mal_section.xml
+++ b/doc/mallard/C/mal_section.xml
@@ -14,7 +14,7 @@ mal_section = element section {
attribute style { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
<link xref="mal_info">mal_info</link> ?,
- <link xref="mal_title">mal_title</link>,
+ <link xref="mal_block_title">mal_block_title</link>,
<link xref="mal_block">mal_block</link> *,
<link xref="mal_section">mal_section</link> *
}
diff --git a/doc/mallard/C/mal_table.xml b/doc/mallard/C/mal_table.xml
index 4277e55..4434b73 100644
--- a/doc/mallard/C/mal_table.xml
+++ b/doc/mallard/C/mal_table.xml
@@ -24,7 +24,7 @@ mal_table = element table {
list { ("rows" | "rowgroups" | "cols" | "colgroups") * }
} ?,
- <link xref="mal_title">mal_title</link> ?,
+ <link xref="mal_block_title">mal_block_title</link> ?,
<link xref="mal_block_desc">mal_block_desc</link> ?,
( <link xref="mal_table_col">mal_table_col</link> + |
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]