svn commit - mysqldoc@docsrva: r5296 - trunk/dynamic-docs/opsfunctions

[mcbrown]

Author: mcbrown
Date: 2007-03-10 08:41:29 +0100 (Sat, 10 Mar 2007)
New Revision: 5296

Log:
Altering DTD slightly. 

We now support multiple <formats> with the same arguments, and multiple argument blocks



Modified:
   trunk/dynamic-docs/opsfunctions/opfunctions.dtd
   trunk/dynamic-docs/opsfunctions/opfunctions.xml


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.dtd
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.dtd	2007-03-10 03:14:06 UTC (rev 5295)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.dtd	2007-03-10 07:41:29 UTC (rev 5296)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 976 bytes

@@ -1,5 +1,5 @@
 <!-- Argument definition -->
-<!ELEMENT arguments (format+ | argument)*>
+<!ELEMENT arguments (format+, argument*)>
 <!ELEMENT argument (#PCDATA)>
 <!ATTLIST argument seq CDATA #REQUIRED>
 <!ATTLIST argument name CDATA #REQUIRED>

@@ -18,7 +18,7 @@
 <!ELEMENT return (#PCDATA)>
 <!ATTLIST return type CDATA #REQUIRED>
 <!ELEMENT opfunctions (operator | function)*>
-<!ELEMENT function (display+ , description ,  arguments , return , error, versions+)>
+<!ELEMENT function (display+ , description ,  arguments* , return , error, versions+)>
 <!ATTLIST function inversion CDATA #IMPLIED>
 <!ATTLIST function outversion CDATA #IMPLIED>
 <!ATTLIST function deprecated CDATA #IMPLIED>


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-03-10 03:14:06 UTC (rev 5295)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-03-10 07:41:29 UTC (rev 5296)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 3; 1590 bytes

@@ -356,7 +356,6 @@
   <function id="case" class="controlflow">
     <display>CASE</display>
     <description lang="en">Case statement</description>
-    <arguments/>
     <return type="none"/>
     <error type="sql"/>
     <versions>

@@ -477,6 +476,7 @@
       <argument seq="1" name="expr" type="numeric"></argument>
       <argument seq="2" name="expr" type="numeric"></argument>
     </arguments>
+
     <return type="value"/>
     <error type="return"/>
     <versions>

@@ -874,10 +874,12 @@
       <format><![CDATA[ADDDATE(<replaceable>date</replaceable>,INTERVAL
           <replaceable>expr</replaceable>
           <replaceable>unit</replaceable>)]]></format>
-      <format><![CDATA[ADDDATE(<replaceable>expr</replaceable>,<replaceable>days</replaceable>)]]></format>      
       <argument seq="1" name="expr" type="numeric">date</argument>
       <argument seq="2" name="expr" type="numeric">INTERVAL number unit</argument>
-      <argument seq="1" name="expr" type="date">date</argument>
+    </arguments>
+    <arguments>
+      <format><![CDATA[ADDDATE(<replaceable>expr</replaceable>,<replaceable>days</replaceable>)]]></format>      
+    <argument seq="1" name="expr" type="date">date</argument>
       <argument seq="2" name="expr" type="date">days</argument>
     </arguments>
     <return type="date"/>