Bug 308221: Update bugzilla.dtd to comply with schema - Patch by Greg Hendricks ...

diff --git a/bugzilla.dtd b/bugzilla.dtd
index 9b4ed4f67cee2548a8d055c15625523926b4961f..a8453304c25b554051ba538af9338a5383e1968d 100644 (file)
--- a/bugzilla.dtd
+++ b/bugzilla.dtd
@@ -5,7 +5,7 @@
        maintainer CDATA #REQUIRED
        exporter CDATA #IMPLIED
 >
-<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dependson*, blocked*, votes?, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time)?, group*, long_desc*, attachment*)?)>
+<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dependson*, blocked*, votes?, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time, deadline)?, group*, flag*, long_desc*, attachment*)?)>
 <!ATTLIST bug
        error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
 >
@@ -44,20 +44,30 @@
 <!ELEMENT estimated_time (#PCDATA)>
 <!ELEMENT remaining_time (#PCDATA)>
 <!ELEMENT actual_time (#PCDATA)>
+<!ELEMENT deadline (#PCDATA)>
 <!ELEMENT long_desc (who, bug_when, thetext)>
+<!ATTLIST long_desc
+          encoding (base64) #IMPLIED
+          isprivate (0|1) #IMPLIED
+ >
 <!ELEMENT who (#PCDATA)>
 <!ELEMENT bug_when (#PCDATA)>
 <!ELEMENT thetext (#PCDATA)>
-<!ELEMENT attachment (attachid, date, desc, type?, data?, flag*)>
+<!ELEMENT attachment (attachid, date, desc, filename?, type?, data?, flag*)>
 <!ATTLIST attachment
           isobsolete (0|1) #IMPLIED
           ispatch (0|1) #IMPLIED
+          isprivate (0|1) #IMPLIED
 >
 <!ELEMENT attachid (#PCDATA)>
 <!ELEMENT date (#PCDATA)>
 <!ELEMENT desc (#PCDATA)>
+<!ELEMENT filename (#PCDATA)>
 <!ELEMENT type (#PCDATA)>
 <!ELEMENT data (#PCDATA)>
+<!ATTLIST data
+          encoding (base64) #IMPLIED
+>
 <!ELEMENT flag EMPTY>
 <!ATTLIST flag
           name CDATA #REQUIRED