[gnome-doc-utils] [mallard] Removing the copyright element and moving copyrights to credit
- From: Shaun McCance <shaunm src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-doc-utils] [mallard] Removing the copyright element and moving copyrights to credit
- Date: Tue, 8 Sep 2009 18:50:22 +0000 (UTC)
commit 4cfa55e4fcb36ded134f1c5be0d539585c7d03de
Author: Shaun McCance <shaunm gnome org>
Date: Tue Sep 8 13:49:57 2009 -0500
[mallard] Removing the copyright element and moving copyrights to credit
doc/mallard/C/details.page | 5 +--
doc/mallard/C/docbook.page | 8 ++-
doc/mallard/C/explore.page | 5 +--
doc/mallard/C/i18n.page | 5 +--
doc/mallard/C/index.page | 5 +--
doc/mallard/C/its.page | 5 +--
doc/mallard/C/l10n.page | 5 +--
doc/mallard/C/links.page | 5 +--
doc/mallard/C/mal_attr_link.page | 5 +--
doc/mallard/C/mal_block.page | 5 +--
doc/mallard/C/mal_block_cite.page | 5 +--
doc/mallard/C/mal_block_code.page | 5 +--
doc/mallard/C/mal_block_comment.page | 5 +--
doc/mallard/C/mal_block_desc.page | 5 +--
doc/mallard/C/mal_block_example.page | 5 +--
doc/mallard/C/mal_block_figure.page | 5 +--
doc/mallard/C/mal_block_list.page | 5 +--
doc/mallard/C/mal_block_listing.page | 5 +--
doc/mallard/C/mal_block_media.page | 5 +--
doc/mallard/C/mal_block_note.page | 5 +--
doc/mallard/C/mal_block_p.page | 5 +--
doc/mallard/C/mal_block_quote.page | 5 +--
doc/mallard/C/mal_block_screen.page | 5 +--
doc/mallard/C/mal_block_steps.page | 5 +--
doc/mallard/C/mal_block_synopsis.page | 5 +--
doc/mallard/C/mal_block_terms.page | 5 +--
doc/mallard/C/mal_block_tree.page | 5 +--
doc/mallard/C/mal_external.page | 5 +--
doc/mallard/C/mal_info.page | 5 --
doc/mallard/C/mal_info_copyright.page | 97 ---------------------------------
doc/mallard/C/mal_info_credit.page | 47 +++++++++-------
doc/mallard/C/mal_info_desc.page | 5 +--
doc/mallard/C/mal_info_email.page | 18 ++----
doc/mallard/C/mal_info_license.page | 5 +--
doc/mallard/C/mal_info_name.page | 23 ++------
doc/mallard/C/mal_info_revision.page | 5 +--
doc/mallard/C/mal_info_title.page | 5 +--
doc/mallard/C/mal_info_years.page | 74 +++++++++++++++++++++++++
doc/mallard/C/mal_inline.page | 5 +--
doc/mallard/C/mal_inline_app.page | 5 +--
doc/mallard/C/mal_inline_cmd.page | 5 +--
doc/mallard/C/mal_inline_code.page | 5 +--
doc/mallard/C/mal_inline_em.page | 5 +--
doc/mallard/C/mal_inline_file.page | 5 +--
doc/mallard/C/mal_inline_gui.page | 5 +--
doc/mallard/C/mal_inline_guiseq.page | 5 +--
doc/mallard/C/mal_inline_input.page | 5 +--
doc/mallard/C/mal_inline_key.page | 5 +--
doc/mallard/C/mal_inline_keyseq.page | 5 +--
doc/mallard/C/mal_inline_link.page | 5 +--
doc/mallard/C/mal_inline_media.page | 5 +--
doc/mallard/C/mal_inline_output.page | 5 +--
doc/mallard/C/mal_inline_span.page | 5 +--
doc/mallard/C/mal_inline_sys.page | 5 +--
doc/mallard/C/mal_inline_var.page | 5 +--
doc/mallard/C/mal_page.page | 5 +--
doc/mallard/C/mal_section.page | 5 +--
doc/mallard/C/principles.page | 5 +--
doc/mallard/C/spec.page | 5 +--
doc/mallard/C/tenminutes.page | 5 +--
doc/mallard/Makefile.am | 2 +-
xslt/mallard/html/mal2html-page.xsl | 8 ++--
62 files changed, 176 insertions(+), 371 deletions(-)
---
diff --git a/doc/mallard/C/details.page b/doc/mallard/C/details.page
index e5c4ece..f332193 100644
--- a/doc/mallard/C/details.page
+++ b/doc/mallard/C/details.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008</years>
</credit>
- <copyright>
- <year>2008</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/docbook.page b/doc/mallard/C/docbook.page
index 53969fd..0f25b32 100644
--- a/doc/mallard/C/docbook.page
+++ b/doc/mallard/C/docbook.page
@@ -377,7 +377,8 @@ available.</p>
</tr></tbody>
<tbody><tr>
<td><p><code href="http://www.docbook.org/tdg/en/html/copyright.html">copyright</code></p></td>
- <td><p>Similar to the <code xref="mal_info_copyright">copyright</code> element.</p></td>
+ <td rowspan="2"><p>Use the <code xref="mal_info_credit">credit</code> element to
+ record copyright information.</p></td>
</tr></tbody>
<tbody><tr>
<td><p><code href="http://www.docbook.org/tdg/en/html/coref.html">coref</code></p></td>
@@ -648,8 +649,9 @@ available.</p>
</tr></tbody>
<tbody><tr>
<td><p><code href="http://www.docbook.org/tdg/en/html/holder.html">holder</code></p></td>
- <td><p>Similar to the <link xref="mal_info_copyright">name</link> element in
- a <link xref="mal_info_copyright">copyright</link> element.</p></td>
+ <td><p>Use the <code xref="mal_info_name">name</code> element in a
+ <code xref="mal_info_credit">credit</code> element. Mallard records
+ copyright information in <code>credit</code> elements.</p></td>
</tr></tbody>
<tbody><tr>
<td><p><code href="http://www.docbook.org/tdg/en/html/honorific.html">honorific</code></p></td>
diff --git a/doc/mallard/C/explore.page b/doc/mallard/C/explore.page
index 89c691c..2f2d5af 100644
--- a/doc/mallard/C/explore.page
+++ b/doc/mallard/C/explore.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/i18n.page b/doc/mallard/C/i18n.page
index 4318f7a..7e4bb54 100644
--- a/doc/mallard/C/i18n.page
+++ b/doc/mallard/C/i18n.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
</info>
<title>Internationalization Notes</title>
diff --git a/doc/mallard/C/index.page b/doc/mallard/C/index.page
index 9aa27ad..12f0c13 100644
--- a/doc/mallard/C/index.page
+++ b/doc/mallard/C/index.page
@@ -14,11 +14,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007</years>
</credit>
- <copyright>
- <year>2007</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
</info>
diff --git a/doc/mallard/C/its.page b/doc/mallard/C/its.page
index 82cdd6d..cb2d7b6 100644
--- a/doc/mallard/C/its.page
+++ b/doc/mallard/C/its.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<desc>Conformance to the W3C Internationalization and Localization
Markup Requirements.</desc>
diff --git a/doc/mallard/C/l10n.page b/doc/mallard/C/l10n.page
index 715ee18..3d5150a 100644
--- a/doc/mallard/C/l10n.page
+++ b/doc/mallard/C/l10n.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
</info>
<title>Translation Notes</title>
diff --git a/doc/mallard/C/links.page b/doc/mallard/C/links.page
index 789ac7f..44716dd 100644
--- a/doc/mallard/C/links.page
+++ b/doc/mallard/C/links.page
@@ -12,11 +12,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
</info>
<title>Automatic Links</title>
diff --git a/doc/mallard/C/mal_attr_link.page b/doc/mallard/C/mal_attr_link.page
index 2b7ed1f..1c03d50 100644
--- a/doc/mallard/C/mal_attr_link.page
+++ b/doc/mallard/C/mal_attr_link.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008</years>
</credit>
- <copyright>
- <year>2008</year>
- <name>Shaun McCance</name>
- </copyright>
<revision version="0.1" date="2008-02-19" status="incomplete"/>
diff --git a/doc/mallard/C/mal_block.page b/doc/mallard/C/mal_block.page
index 31c471f..bc97c83 100644
--- a/doc/mallard/C/mal_block.page
+++ b/doc/mallard/C/mal_block.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_cite.page b/doc/mallard/C/mal_block_cite.page
index 279888b..321e10a 100644
--- a/doc/mallard/C/mal_block_cite.page
+++ b/doc/mallard/C/mal_block_cite.page
@@ -9,11 +9,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008</years>
</credit>
- <copyright>
- <year>2008</year>
- <name>Shaun McCance</name>
- </copyright>
<revision version="0.1" date="2007-02-08" status="draft"/>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_code.page b/doc/mallard/C/mal_block_code.page
index 10e7a65..ff0b04e 100644
--- a/doc/mallard/C/mal_block_code.page
+++ b/doc/mallard/C/mal_block_code.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_comment.page b/doc/mallard/C/mal_block_comment.page
index e2c3594..35bf956 100644
--- a/doc/mallard/C/mal_block_comment.page
+++ b/doc/mallard/C/mal_block_comment.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_desc.page b/doc/mallard/C/mal_block_desc.page
index 4b0c103..aae6d6c 100644
--- a/doc/mallard/C/mal_block_desc.page
+++ b/doc/mallard/C/mal_block_desc.page
@@ -12,11 +12,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_example.page b/doc/mallard/C/mal_block_example.page
index f427c57..f56763c 100644
--- a/doc/mallard/C/mal_block_example.page
+++ b/doc/mallard/C/mal_block_example.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_figure.page b/doc/mallard/C/mal_block_figure.page
index c5011ab..21106d4 100644
--- a/doc/mallard/C/mal_block_figure.page
+++ b/doc/mallard/C/mal_block_figure.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_list.page b/doc/mallard/C/mal_block_list.page
index a34af39..8dea44d 100644
--- a/doc/mallard/C/mal_block_list.page
+++ b/doc/mallard/C/mal_block_list.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_listing.page b/doc/mallard/C/mal_block_listing.page
index 0c4b3a0..70864b9 100644
--- a/doc/mallard/C/mal_block_listing.page
+++ b/doc/mallard/C/mal_block_listing.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_media.page b/doc/mallard/C/mal_block_media.page
index a966a74..837fa8b 100644
--- a/doc/mallard/C/mal_block_media.page
+++ b/doc/mallard/C/mal_block_media.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_note.page b/doc/mallard/C/mal_block_note.page
index 4e3ea9d..702fc48 100644
--- a/doc/mallard/C/mal_block_note.page
+++ b/doc/mallard/C/mal_block_note.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_p.page b/doc/mallard/C/mal_block_p.page
index 74ab35e..875d8c6 100644
--- a/doc/mallard/C/mal_block_p.page
+++ b/doc/mallard/C/mal_block_p.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_quote.page b/doc/mallard/C/mal_block_quote.page
index 9073b97..d0abbc5 100644
--- a/doc/mallard/C/mal_block_quote.page
+++ b/doc/mallard/C/mal_block_quote.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_screen.page b/doc/mallard/C/mal_block_screen.page
index 6e3324e..9c0bf8e 100644
--- a/doc/mallard/C/mal_block_screen.page
+++ b/doc/mallard/C/mal_block_screen.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_steps.page b/doc/mallard/C/mal_block_steps.page
index 2da5112..1c8e356 100644
--- a/doc/mallard/C/mal_block_steps.page
+++ b/doc/mallard/C/mal_block_steps.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_synopsis.page b/doc/mallard/C/mal_block_synopsis.page
index d9401c8..7674946 100644
--- a/doc/mallard/C/mal_block_synopsis.page
+++ b/doc/mallard/C/mal_block_synopsis.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_terms.page b/doc/mallard/C/mal_block_terms.page
index 46f3769..158ea9a 100644
--- a/doc/mallard/C/mal_block_terms.page
+++ b/doc/mallard/C/mal_block_terms.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_block_tree.page b/doc/mallard/C/mal_block_tree.page
index 65da596..474980b 100644
--- a/doc/mallard/C/mal_block_tree.page
+++ b/doc/mallard/C/mal_block_tree.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_external.page b/doc/mallard/C/mal_external.page
index 06feb33..4dc47e6 100644
--- a/doc/mallard/C/mal_external.page
+++ b/doc/mallard/C/mal_external.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008</years>
</credit>
- <copyright>
- <year>2008</year>
- <name>Shaun McCance</name>
- </copyright>
<revision version="0.1" date="2008-02-19" status="incomplete"/>
diff --git a/doc/mallard/C/mal_info.page b/doc/mallard/C/mal_info.page
index 3146e1d..7d448e4 100644
--- a/doc/mallard/C/mal_info.page
+++ b/doc/mallard/C/mal_info.page
@@ -17,7 +17,6 @@ mal_info = element info {
(
<link xref="mal_info_desc">mal_info_desc</link> ? &
<link xref="mal_info_credit">mal_info_credit</link> * &
- <link xref="mal_info_copyright">mal_info_copyright</link> * &
<link xref="mal_info_license">mal_info_license</link> * &
<link xref="mal_info_link">mal_info_link</link> * &
<link xref="mal_info_title">mal_info_title</link> * &
@@ -32,10 +31,6 @@ credit/date
credit/email
credit/name
-copyright
-copyright/date
-copyright/name
-
link (guide/page/seealso)
? version number date
diff --git a/doc/mallard/C/mal_info_credit.page b/doc/mallard/C/mal_info_credit.page
index 2840ac1..4ec8d28 100644
--- a/doc/mallard/C/mal_info_credit.page
+++ b/doc/mallard/C/mal_info_credit.page
@@ -5,16 +5,13 @@
<info>
<link type="guide" xref="mal_info#elements"/>
- <revision version="0.1" date="2009-05-28" status="review"/>
+ <revision version="0.1" date="2009-09-08" status="review"/>
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008</years>
</credit>
- <copyright>
- <year>2008</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
@@ -25,43 +22,44 @@
<synopsis><code mime="application/relax-ng-compact-syntax">
mal_info_credit = element credit {
- attribute type {
- "author" | "editor" |
- "maintainer" | "collaborator" |
- "translator" | "publisher" } ?,
+ attribute type { xsd:NMTOKENS } ?,
attribute * - (mal:* | local:*) { text } *,
(
<link xref="mal_info_name">mal_info_name</link> &
<link xref="mal_info_email">mal_info_email</link> ? &
+ <link xref="mal_info_years">mal_info_years</link> ? &
<link xref="mal_external">mal_external</link> *
)
}
</code></synopsis>
-<p>Use the <code>credit</code> element to record credits for who has contributed
-to the page or section. You can optionally use the <code>type</code> attribute
-to specify what type of contribution the person has made. If a person has made
-contributions in multiple roles, include multiple <code>credit</code> elements
-for that person.</p>
+<p>Use the <code>credit</code> element to record who has contributed to the page
+or section. You can optionally use the <code>type</code> attribute to specify
+what types of contribution the person has made. The <code>credit</code> element
+also specifies copyright holders when used with the
+<code xref="mal_info_years">years</code> element.</p>
<!-- BEGIN notes -->
<section id="notes">
<title>Notes</title>
<list>
- <item><p>The <code>credit</code> element contains a <code>name</code> element
- and an optional <code>email</code> element. The <code>credit</code> element
- can also contain elements from external namespaces. The order of the child
- elements does not matter.</p></item>
+ <item><p>The <code>credit</code> element contains a
+ <code xref="mal_info_name">name</code> element,
+ an optional <code xref="mal_info_email">>email</code> element,
+ and an optional <code xref="mal_info_years">years</code> element. The
+ <code>credit</code> element can also contain elements from external
+ namespaces. The order of the child elements does not matter.</p></item>
<item><p>The <code>credit</code> element can occur in any
<code xref="mal_info">info</code> element.</p></item>
<item>
<p>The optional <code>type</code> attribute can be used to specify
- what type of contribution the person has made. The following values are
- allowed:</p>
+ what type of contribution the person has made. The <code>type</code>
+ attribute contains a space-separated list of credit types. The following
+ values are recommended:</p>
<table rules="rows">
<tr>
@@ -73,6 +71,10 @@ for that person.</p>
<td><p>somebody who has provided reviews or editorial corrections</p></td>
</tr>
<tr>
+ <td><p><code>"copyright"</code></p></td>
+ <td><p>a person or entity which holds copyright on the work</p></td>
+ </tr>
+ <tr>
<td><p><code>"maintainer"</code></p></td>
<td><p>the person or entity currently responsible for the work</p></td>
</tr>
@@ -134,6 +136,11 @@ for that person.</p>
content. While Mallard does not provide child elements for everything that can
be recorded in DocBook, elements from external namespaces may be used for any
additional information that is needed.</p>
+
+ <p>The <code>credit</code> element also records copyright information.
+ In this capacity, it is similar to the
+ <code href="http://www.docbook.org/tdg/en/html/copyright.html">copyright</code>
+ element in DocBook.</p>
</section>
<!-- END comparison -->
diff --git a/doc/mallard/C/mal_info_desc.page b/doc/mallard/C/mal_info_desc.page
index 17b5965..8ccfbdf 100644
--- a/doc/mallard/C/mal_info_desc.page
+++ b/doc/mallard/C/mal_info_desc.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_info_email.page b/doc/mallard/C/mal_info_email.page
index 0a51fce..e70a70f 100644
--- a/doc/mallard/C/mal_info_email.page
+++ b/doc/mallard/C/mal_info_email.page
@@ -5,16 +5,13 @@
<info>
<link type="guide" xref="mal_info#additional"/>
- <revision version="0.1" date="2009-08-01" status="review"/>
+ <revision version="0.1" date="2009-09-08" status="review"/>
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
@@ -31,8 +28,7 @@ mal_info_email = element email {
</code></synopsis>
<p>Use the <code>email</code> element to mark up the email address for a
-person or organization in a <code xref="mal_info_copyright">copyright</code>
-or <code xref="mal_info_credit">credit</code> element.</p>
+person or organization in a <code xref="mal_info_credit">credit</code> element.</p>
<!-- BEGIN notes -->
@@ -42,8 +38,7 @@ or <code xref="mal_info_credit">credit</code> element.</p>
<item><p>The <code>email</code> element can contain a mixture of text and
any <link xref="mal_inline">general inline elements</link>.</p></item>
- <item><p>The <code>email</code> element can occur in a
- <code xref="mal_info_copyright">copyright</code> or
+ <item><p>The <code>email</code> element can occur in the
<code xref="mal_info_credit">credit</code> element.</p></item>
<item><p>The <code>email</code> element can have attributes from external
@@ -59,8 +54,7 @@ or <code xref="mal_info_credit">credit</code> element.</p>
<title>Processing Expectations</title>
<p>See the processing expectations for the
- <code xref="mal_info_copyright">copyright</code> and
- <code xref="mal_info_credit">credit</code> elements.</p>
+ <code xref="mal_info_credit">credit</code> element.</p>
</section>
<!-- END processing -->
@@ -70,7 +64,7 @@ or <code xref="mal_info_credit">credit</code> element.</p>
<title>Comparison to Other Formats</title>
<p>The <code>email</code> element is similar to the
- <code href="http://www.docbook.org/tdg/en/html/email.html">code</code>
+ <code href="http://www.docbook.org/tdg/en/html/email.html">email</code>
element in DocBook when that element is used in an informational context.
The <code>email</code> element in Mallard does not double as an inline
element.</p>
diff --git a/doc/mallard/C/mal_info_license.page b/doc/mallard/C/mal_info_license.page
index dd38d0e..87d165f 100644
--- a/doc/mallard/C/mal_info_license.page
+++ b/doc/mallard/C/mal_info_license.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_info_name.page b/doc/mallard/C/mal_info_name.page
index 5438d58..d41dc82 100644
--- a/doc/mallard/C/mal_info_name.page
+++ b/doc/mallard/C/mal_info_name.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
@@ -31,8 +28,7 @@ mal_info_name = element name {
</code></synopsis>
<p>Use the <code>name</code> element to mark up the name of a person or
-organization in a <code xref="mal_info_copyright">copyright</code> or
-<code xref="mal_info_credit">credit</code> element.</p>
+organization in a <code xref="mal_info_credit">credit</code> element.</p>
<!-- BEGIN notes -->
@@ -42,8 +38,7 @@ organization in a <code xref="mal_info_copyright">copyright</code> or
<item><p>The <code>name</code> element can contain a mixture of text and
any <link xref="mal_inline">general inline elements</link>.</p></item>
- <item><p>The <code>name</code> element can occur in a
- <code xref="mal_info_copyright">copyright</code> or
+ <item><p>The <code>name</code> element can occur in the
<code xref="mal_info_credit">credit</code> element.</p></item>
<item><p>The <code>name</code> element can have attributes from external
@@ -59,8 +54,7 @@ organization in a <code xref="mal_info_copyright">copyright</code> or
<title>Processing Expectations</title>
<p>See the processing expectations for the
- <code xref="mal_info_copyright">copyright</code> and
- <code xref="mal_info_credit">credit</code> elements.</p>
+ <code xref="mal_info_credit">credit</code> element.</p>
</section>
<!-- END processing -->
@@ -69,13 +63,8 @@ organization in a <code xref="mal_info_copyright">copyright</code> or
<section id="comparison">
<title>Comparison to Other Formats</title>
- <p>In a <code xref="mal_info_copyright">copyright</code> element, the
- <code>name</code> element is similar to the
- <code href="http://www.docbook.org/tdg/en/html/holder.html">holder</code>
- element in DocBook.</p>
-
- <p>In a <code xref="mal_info_credit">credit</code> element, the <code>name</code>
- element fulfills the same role as numerous DocBook elements, including
+ <p>The <code>name</code> element fulfills the same role as numerous DocBook
+ elements, including
<link href="http://www.docbook.org/tdg/en/html/collabname.html">collabname</link>,
<link xref="http://www.docbook.org/tdg/en/html/personname.html">personname</link>, and
<link xref="http://www.docbook.org/tdg/en/html/publishername.html">publishername</link>.
diff --git a/doc/mallard/C/mal_info_revision.page b/doc/mallard/C/mal_info_revision.page
index ace062a..91c3506 100644
--- a/doc/mallard/C/mal_info_revision.page
+++ b/doc/mallard/C/mal_info_revision.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_info_title.page b/doc/mallard/C/mal_info_title.page
index 9492a7d..3b26f3d 100644
--- a/doc/mallard/C/mal_info_title.page
+++ b/doc/mallard/C/mal_info_title.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_info_years.page b/doc/mallard/C/mal_info_years.page
new file mode 100644
index 0000000..8fef04a
--- /dev/null
+++ b/doc/mallard/C/mal_info_years.page
@@ -0,0 +1,74 @@
+<page xmlns="http://projectmallard.org/1.0/"
+ type="topic"
+ id="mal_info_years">
+
+<info>
+ <link type="guide" xref="mal_info#additional"/>
+
+ <revision version="0.1" date="2009-09-08" status="stub"/>
+
+ <credit type="author">
+ <name>Shaun McCance</name>
+ <email>shaunm gnome org</email>
+ <years>2009</years>
+ </credit>
+
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+
+ <desc>FIXME</desc>
+</info>
+
+<title>Copyright Years</title>
+
+<synopsis><code mime="application/relax-ng-compact-syntax">
+mal_info_years = element years {
+ attribute * - (mal:* | local:*) { text } *,
+ <link xref="mal_inline">mal_inline</link>
+}
+</code></synopsis>
+
+<p>Use the <code>years</code> element to mark up the years for which
+a person or organization holds a copyright.</p>
+
+
+<!-- BEGIN notes -->
+<section id="notes">
+ <title>Notes</title>
+ <list>
+ <item><p>The <code>years</code> element can contain a mixture of text and
+ any <link xref="mal_inline">general inline elements</link>.</p></item>
+
+ <item><p>The <code>years</code> element can occur in the
+ <code xref="mal_info_credit">credit</code> element.</p></item>
+
+ <item><p>The <code>years</code> element can have attributes from external
+ namespaces. See <link xref="mal_external"/> for more information
+ on external-namespace attributes.</p></item>
+ </list>
+</section>
+<!-- END notes -->
+
+
+<!-- BEGIN processing -->
+<section id="processing">
+ <title>Processing Expectations</title>
+
+ <p>See the processing expectations for the
+ <code xref="mal_info_credit">credit</code> element.</p>
+</section>
+<!-- END processing -->
+
+
+<!-- BEGIN comparison -->
+<section id="comparison">
+ <title>Comparison to Other Formats</title>
+
+ <p>The <code>years</code> element is similar to the
+ <code href="http://www.docbook.org/tdg/en/html/year.html">year</code> element
+ in DocBook. In DocBook, each year is listed separately, and processing tools
+ are expected to join them appropriately. In Mallard, all years are listed in
+ a single <code>years</code> element, formatted as they should be displayed.</p>
+</section>
+<!-- END comparison -->
+
+</page>
diff --git a/doc/mallard/C/mal_inline.page b/doc/mallard/C/mal_inline.page
index a2418f5..f2cc5cd 100644
--- a/doc/mallard/C/mal_inline.page
+++ b/doc/mallard/C/mal_inline.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_app.page b/doc/mallard/C/mal_inline_app.page
index 37f9ec2..557c98b 100644
--- a/doc/mallard/C/mal_inline_app.page
+++ b/doc/mallard/C/mal_inline_app.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_cmd.page b/doc/mallard/C/mal_inline_cmd.page
index 91a0c93..fa38094 100644
--- a/doc/mallard/C/mal_inline_cmd.page
+++ b/doc/mallard/C/mal_inline_cmd.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_code.page b/doc/mallard/C/mal_inline_code.page
index d547ccc..d75f1a0 100644
--- a/doc/mallard/C/mal_inline_code.page
+++ b/doc/mallard/C/mal_inline_code.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_em.page b/doc/mallard/C/mal_inline_em.page
index ce24926..92be5ae 100644
--- a/doc/mallard/C/mal_inline_em.page
+++ b/doc/mallard/C/mal_inline_em.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_file.page b/doc/mallard/C/mal_inline_file.page
index aa56254..579ffd0 100644
--- a/doc/mallard/C/mal_inline_file.page
+++ b/doc/mallard/C/mal_inline_file.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_gui.page b/doc/mallard/C/mal_inline_gui.page
index 08ada52..5ce02bb 100644
--- a/doc/mallard/C/mal_inline_gui.page
+++ b/doc/mallard/C/mal_inline_gui.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_guiseq.page b/doc/mallard/C/mal_inline_guiseq.page
index b92caa7..d2af913 100644
--- a/doc/mallard/C/mal_inline_guiseq.page
+++ b/doc/mallard/C/mal_inline_guiseq.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_input.page b/doc/mallard/C/mal_inline_input.page
index 4f45dd0..ef09cef 100644
--- a/doc/mallard/C/mal_inline_input.page
+++ b/doc/mallard/C/mal_inline_input.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_key.page b/doc/mallard/C/mal_inline_key.page
index 8410367..bd32811 100644
--- a/doc/mallard/C/mal_inline_key.page
+++ b/doc/mallard/C/mal_inline_key.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_keyseq.page b/doc/mallard/C/mal_inline_keyseq.page
index 50b8e7d..15b8b18 100644
--- a/doc/mallard/C/mal_inline_keyseq.page
+++ b/doc/mallard/C/mal_inline_keyseq.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_link.page b/doc/mallard/C/mal_inline_link.page
index 2bb10a0..8811b63 100644
--- a/doc/mallard/C/mal_inline_link.page
+++ b/doc/mallard/C/mal_inline_link.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_media.page b/doc/mallard/C/mal_inline_media.page
index 0e001ce..9a8cb15 100644
--- a/doc/mallard/C/mal_inline_media.page
+++ b/doc/mallard/C/mal_inline_media.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_output.page b/doc/mallard/C/mal_inline_output.page
index b8de042..40802c6 100644
--- a/doc/mallard/C/mal_inline_output.page
+++ b/doc/mallard/C/mal_inline_output.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_span.page b/doc/mallard/C/mal_inline_span.page
index d849632..4b55e45 100644
--- a/doc/mallard/C/mal_inline_span.page
+++ b/doc/mallard/C/mal_inline_span.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_sys.page b/doc/mallard/C/mal_inline_sys.page
index acc583f..710a3cf 100644
--- a/doc/mallard/C/mal_inline_sys.page
+++ b/doc/mallard/C/mal_inline_sys.page
@@ -10,11 +10,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_inline_var.page b/doc/mallard/C/mal_inline_var.page
index a0e743d..0439f9e 100644
--- a/doc/mallard/C/mal_inline_var.page
+++ b/doc/mallard/C/mal_inline_var.page
@@ -12,11 +12,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2007-2009</years>
</credit>
- <copyright>
- <year>2007-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_page.page b/doc/mallard/C/mal_page.page
index 276e1e6..7ba23ad 100644
--- a/doc/mallard/C/mal_page.page
+++ b/doc/mallard/C/mal_page.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/mal_section.page b/doc/mallard/C/mal_section.page
index ba50a61..963a3e4 100644
--- a/doc/mallard/C/mal_section.page
+++ b/doc/mallard/C/mal_section.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/principles.page b/doc/mallard/C/principles.page
index a1f6d9c..ca24eaa 100644
--- a/doc/mallard/C/principles.page
+++ b/doc/mallard/C/principles.page
@@ -8,11 +8,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/C/spec.page b/doc/mallard/C/spec.page
index d1567b8..55e066d 100644
--- a/doc/mallard/C/spec.page
+++ b/doc/mallard/C/spec.page
@@ -11,11 +11,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2009</years>
</credit>
- <copyright>
- <year>2009</year>
- <name>Shaun McCance</name>
- </copyright>
<desc>Complete specification of the Mallard XML vocabulary.</desc>
</info>
diff --git a/doc/mallard/C/tenminutes.page b/doc/mallard/C/tenminutes.page
index 04e4e1d..26a158c 100644
--- a/doc/mallard/C/tenminutes.page
+++ b/doc/mallard/C/tenminutes.page
@@ -9,11 +9,8 @@
<credit type="author">
<name>Shaun McCance</name>
<email>shaunm gnome org</email>
+ <years>2008-2009</years>
</credit>
- <copyright>
- <year>2008-2009</year>
- <name>Shaun McCance</name>
- </copyright>
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
diff --git a/doc/mallard/Makefile.am b/doc/mallard/Makefile.am
index 14a53cf..7728225 100644
--- a/doc/mallard/Makefile.am
+++ b/doc/mallard/Makefile.am
@@ -43,7 +43,6 @@ DOC_PAGES = \
mal_block_title.page \
mal_block_tree.page \
mal_external.page \
- mal_info_copyright.page \
mal_info_credit.page \
mal_info_desc.page \
mal_info_email.page \
@@ -53,6 +52,7 @@ DOC_PAGES = \
mal_info.page \
mal_info_revision.page \
mal_info_title.page \
+ mal_info_years.page \
mal_inline_app.page \
mal_inline_cmd.page \
mal_inline_code.page \
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index adaeaf5..52a56e1 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -39,13 +39,13 @@ $node: The top-level #{page} element
REMARK: Describe this template
-->
-<xsl:template name="db2html.page.copyrights">
+<xsl:template name="mal2html.page.copyrights">
<xsl:param name="node"/>
<div class="copyrights">
- <xsl:for-each select="$node/mal:info/mal:copyright">
+ <xsl:for-each select="$node/mal:info/mal:credit[mal:years]">
<div class="copyright">
<!-- FIXME: i18n, multi-year, email -->
- <xsl:value-of select="concat('© ', mal:year, ' ', mal:name)"/>
+ <xsl:value-of select="concat('© ', mal:years, ' ', mal:name)"/>
</div>
</xsl:for-each>
</div>
@@ -572,7 +572,7 @@ REMARK: Describe this template
</xsl:if>
<xsl:apply-templates select="."/>
</div>
- <xsl:call-template name="db2html.page.copyrights">
+ <xsl:call-template name="mal2html.page.copyrights">
<xsl:with-param name="node" select="."/>
</xsl:call-template>
</body>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]