Merge "(bug 37178) Allow pagination link l10n"

[lhc/web/wiklou.git] / docs / export-0.7.xsd

diff --git a/docs/export-0.7.xsd b/docs/export-0.7.xsd
index c2656a3..2d64036 100644 (file)
--- a/docs/export-0.7.xsd
+++ b/docs/export-0.7.xsd
@@ -21,6 +21,7 @@
        Version 0.7 adds a unique identity constraint for both page and
        revision identifiers. See also bug 4220.
        Fix type for <ns> from "positiveInteger" to "nonNegativeInteger" to allow 0
+       Moves <logitem> to its right location.
 
        The canonical URL to the schema document is:
        http://www.mediawiki.org/xml/export-0.7.xsd
@@ -63,6 +64,8 @@
                                         minOccurs="0" maxOccurs="1"/>
                        <element name="page" type="mw:PageType"
                                         minOccurs="0" maxOccurs="unbounded"/>
+                       <element name="logitem" type="mw:LogItemType"
+                                        minOccurs="0" maxOccurs="unbounded"/>
                </sequence>
                <attribute name="version" type="string" use="required"/>
                <attribute ref="xml:lang" use="required"/>
@@ -137,7 +140,6 @@
                        <choice minOccurs="0" maxOccurs="unbounded">
                                <element name="revision" type="mw:RevisionType" />
                                <element name="upload" type="mw:UploadType" />
-                               <element name="logitem" type="mw:LogItemType" />
                        </choice>
 
                        <!-- Zero or One sets of discussion threading data -->
@@ -165,7 +167,9 @@
                        <element name="comment" type="mw:CommentType" minOccurs="0"/>
                        <element name="type" type="string" />
                        <element name="action" type="string" />
-                       <element name="text" type="mw:TextType" />
+                       <element name="text" type="mw:LogTextType" minOccurs="0" maxOccurs="1" />
+                       <element name="logtitle" type="string" minOccurs="0" maxOccurs="1" />
+                       <element name="params" type="mw:LogParamsType" minOccurs="0" maxOccurs="1" />
                </sequence>
        </complexType>
 
@@ -193,6 +197,23 @@
                </simpleContent>
        </complexType>
 
+       <complexType name="LogTextType">
+               <simpleContent>
+                       <extension base="string">
+                               <!-- This allows deleted=deleted on non-empty elements, but XSD is not omnipotent -->
+                               <attribute name="deleted" use="optional" type="mw:DeletedFlagType"/>
+                       </extension>
+               </simpleContent>
+       </complexType>
+
+       <complexType name="LogParamsType">
+               <simpleContent>
+                       <extension base="string">
+                               <attribute ref="xml:space" use="optional" default="preserve" />
+                       </extension>
+               </simpleContent>
+       </complexType>
+
        <complexType name="ContributorType">
                <sequence>
                        <element name="username" type="string" minOccurs="0"/>
@@ -211,7 +232,7 @@
                        <element name="contributor" type="mw:ContributorType"/>
                        <element name="comment" type="string" minOccurs="0"/>
 
-                       <!-- Filename. (Using underscores, not spaces. No 'Image:' namespace marker.) -->
+                       <!-- Filename. (Using underscores, not spaces. No 'File:' namespace marker.) -->
                        <element name="filename" type="string"/>
 
                        <!-- URI at which this resource can be obtained -->