From 9c135ff9c19fca048eddd97c422613266300497e Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Thu, 8 Nov 2007 16:33:07 +0000
Subject: [PATCH] defined children of legal element

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1361 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep.dtd |  4 ++++
 xep.xsd | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/xep.dtd b/xep.dtd
index 5ea3091f..802173b4 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -5,6 +5,10 @@
 <!ELEMENT title (#PCDATA)* >
 <!ELEMENT abstract (#PCDATA)* >
 <!ELEMENT legal ( conformance, copyright, permissions, warranty ) >
+<!ELEMENT conformance (#PCDATA | link)* >
+<!ELEMENT copyright (#PCDATA | link)* >
+<!ELEMENT permissions (#PCDATA | link)* >
+<!ELEMENT warranty (#PCDATA | link)* >
 <!ELEMENT number (#PCDATA)* >
 <!ELEMENT status (#PCDATA)* >
 <!ELEMENT type (#PCDATA)* >
diff --git a/xep.xsd b/xep.xsd
index 0ead268a..c1dc748f 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -34,7 +34,7 @@
       <xs:sequence>
         <xs:element name='title' type='xs:string'/>
         <xs:element name='abstract' type='xs:string'/>
-        <xs:element name='legal' type='xs:string'/>
+        <xs:element ref='legal'/>
         <xs:element name='number' type='xs:byte'/>
         <xs:element ref='status'/>
         <xs:element ref='type'/> 
@@ -53,6 +53,17 @@
     </xs:complexType>
   </xs:element>
 
+  <xs:element name='legal'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name='conformance' type='markup'/>
+        <xs:element name='copyright' type='markup'/>
+        <xs:element name='permissions' type='markup'/>
+        <xs:element name='warranty' type='markup'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
   <xs:element name='status'>
     <xs:simpleType>
       <xs:restriction base='xs:NCNAME'>