SF.net SVN: docbook: [7462] trunk

[<nw...@us...>]

Revision: 7462
          http://docbook.svn.sourceforge.net/docbook/?rev=7462&view=rev
Author:   nwalsh
Date:     2007-09-27 06:11:42 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
Fix RFE 1759782: Allow uri anywhere email occurs

Modified Paths:
--------------
    trunk/defguide5/en/refpages/elements/uri/db.uri.xml
    trunk/docbook/relaxng/docbook/src/pool.rnc

Modified: trunk/defguide5/en/refpages/elements/uri/db.uri.xml
===================================================================
--- trunk/defguide5/en/refpages/elements/uri/db.uri.xml	2007-09-27 12:55:11 UTC (rev 7461)
+++ trunk/defguide5/en/refpages/elements/uri/db.uri.xml	2007-09-27 13:11:42 UTC (rev 7462)
@@ -35,23 +35,48 @@
 
 <itemizedlist>
 <listitem>
-<para><tag class="attvalue">xmlnamespace</tag></para>
+<para><tag class="attvalue">xmlnamespace</tag> for an XML namespace name,
+e.g., <uri type="xmlnamespace">http://docbook.org/ns/docbook</uri>.</para>
 </listitem>
 <listitem>
-<para><tag class="attvalue">saxfeaturename</tag></para>
+<para><tag class="attvalue">saxfeaturename</tag> for a SAX feature name,
+e.g., <uri type="saxfeaturename">http://xml.org/sax/features/namespaces</uri>.</para>
 </listitem>
 <listitem>
-<para><tag class="attvalue">saxpropertyname</tag></para>
+<para><tag class="attvalue">saxpropertyname</tag> for a SAX property name,
+e.g. <uri type="saxpropertyname">http://xml.org/sax/properties/declaration-handler</uri>.</para>
 </listitem>
 <listitem>
-<para><tag class="attvalue">soapaction</tag></para>
+<para><tag class="attvalue">soapaction</tag> for a SOAP action, see
+<citetitle xlink:href="http://www.w3.org/TR/soap12-part2/#ActionFeature">SOAP
+Version 1.2 Part 2: Adjuncts</citetitle>.</para>
 </listitem>
 <listitem>
-<para><tag class="attvalue">rddlpurpose</tag></para>
+<para><tag class="attvalue">rddlpurpose</tag> for a RDDL purpose, see
+<citetitle xlink:href="http://rddl.org/">Resource Directory Description
+Language (RDDL)</citetitle></para>
 </listitem>
 <listitem>
-<para><tag class="attvalue">rddlnature</tag></para>
+<para><tag class="attvalue">rddlnature</tag> for a RDDL nature, see
+<citetitle xlink:href="http://rddl.org/">Resource Directory Description
+Language (RDDL)</citetitle></para>
 </listitem>
+<listitem>
+<para><tag class="attvalue">homepage</tag> for a home page,
+e.g. <uri type="homepage">http://nwalsh.com/</uri>.</para>
+</listitem>
+<listitem>
+<para><tag class="attvalue">weblog</tag> for a web log,
+e.g., <uri type="weblog">http://norman.walsh.name/</uri>.</para>
+</listitem>
+<listitem>
+<para><tag class="attvalue">webpage</tag> for a web page,
+e.g., <uri type="webpage">http://docbook.org/schemas/</uri>.</para>
+</listitem>
+<listitem>
+<para><tag class="attvalue">website</tag> for a web site,
+e.g., <uri type="website">http://docbook.org</uri>.</para>
+</listitem>
 </itemizedlist>
 </refsection>
 

Modified: trunk/docbook/relaxng/docbook/src/pool.rnc
===================================================================
--- trunk/docbook/relaxng/docbook/src/pool.rnc	2007-09-27 12:55:11 UTC (rev 7461)
+++ trunk/docbook/relaxng/docbook/src/pool.rnc	2007-09-27 13:11:42 UTC (rev 7462)
@@ -3664,6 +3664,7 @@
           | db.phone
           | db.fax
           | db.email
+          | db.uri
           | db.otheraddr)*
       }
 }
@@ -4071,6 +4072,7 @@
    (db.personblurb
     | db.affiliation
     | db.email
+    | db.uri
     | db.address
     | db.contrib)*
 
@@ -4079,6 +4081,7 @@
    (db.orgdiv
     | db.affiliation
     | db.email
+    | db.uri
     | db.address
     | db.contrib)*
 
@@ -4192,7 +4195,7 @@
       element person {
          db.person.attlist,
          db.personname,
-         (db.address|db.affiliation|db.email|db.personblurb)*
+         (db.address|db.affiliation|db.email|db.uri|db.personblurb)*
       }
 }
 
@@ -4215,7 +4218,7 @@
       element org {
          db.org.attlist,
          db.orgname,
-         (db.address|db.affiliation|db.email|db.orgdiv)*
+         (db.address|db.affiliation|db.email|db.uri|db.orgdiv)*
       }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.