Index: XForms-Schema.xsd
===================================================================
--- XForms-Schema.xsd	(revision 341)
+++ XForms-Schema.xsd	(working copy)
@@ -5,7 +5,7 @@
   Changes:
 26-Aug MJD fixed typo where more than one child allowed on <instance>
 04-Sep MJD fixed typo on <send> : attribute 'submission' is required
-04-Sep MJD fixed typo on <rebuild><recalculate><revalidate><refresh>: 'model' attribute is required
+04-Sep MJD fixed typo on <rebuild><recalculate><revalidate><refresh>: '' attribute is required
 06-Sep MJD clarified specific allowed values of @level on <message>
 06-Sep MJD removed UI Common attributes from <help><hint><alert><label>
 09-Sep MJD changed minOccurrs and maxOccurs to use XPath expressions, default values
@@ -72,6 +72,13 @@
 		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		<xsd:anyAttribute namespace="##other"/>
 	</xsd:attributeGroup>
+	<xsd:attributeGroup name="Common.Action.Attributes">
+		<xsd:annotation>
+			<xsd:documentation>Attributes for _every_ action in XForms</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="if" type="xforms:XPathExpression" use="optional"/>
+		<xsd:attribute name="while" type="xforms:XPathExpression" use="optional"/>
+	</xsd:attributeGroup>
 	<xsd:element name="model">
 		<xsd:complexType>
 			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
@@ -100,6 +107,7 @@
 			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
+			<xsd:attribute name="resource" type="xsd:anyURI" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="submission">
@@ -266,7 +274,6 @@
 			<xsd:group ref="xforms:UI.Inline"/>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="hint">
@@ -274,7 +281,6 @@
 			<xsd:group ref="xforms:UI.Inline"/>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="help">
@@ -282,7 +288,6 @@
 			<xsd:group ref="xforms:UI.Inline"/>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="alert">
@@ -290,7 +295,6 @@
 			<xsd:group ref="xforms:UI.Inline"/>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
-			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="extension">
@@ -517,6 +521,7 @@
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 			<xsd:attribute name="appearance" type="xforms:appearanceType" use="optional"/>
 			<xsd:attribute name="value" type="xforms:XPathExpression" use="optional"/>
+			<xsd:attribute name="mediatype" type="xsd:string" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="submit">
@@ -526,7 +531,7 @@
 				<xsd:group ref="xforms:UI.Common" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="submission" type="xsd:IDREF" use="required"/>
+			<xsd:attribute name="submission" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 			<xsd:attributeGroup ref="xforms:UI.Common.Attrs"/>
 		</xsd:complexType>
@@ -572,6 +577,7 @@
 			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="dispatch">
@@ -582,6 +588,7 @@
 			<xsd:attribute name="bubbles" type="xsd:boolean" use="optional" default="true"/>
 			<xsd:attribute name="cancelable" type="xsd:boolean" use="optional" default="true"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="rebuild">
@@ -589,6 +596,7 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 			<!-- E4 -->
 		</xsd:complexType>
 	</xsd:element>
@@ -597,6 +605,7 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 			<!-- E4 -->
 		</xsd:complexType>
 	</xsd:element>
@@ -605,6 +614,7 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 			<!-- E4 -->
 		</xsd:complexType>
 	</xsd:element>
@@ -613,6 +623,7 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 			<!-- E4 -->
 		</xsd:complexType>
 	</xsd:element>
@@ -621,6 +632,7 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="control" type="xsd:IDREF" use="required"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="load">
@@ -638,6 +650,7 @@
 				<!-- E22 -->
 			</xsd:attribute>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="setvalue">
@@ -648,6 +661,7 @@
 					<xsd:attributeGroup ref="xforms:Single.Node.Binding.Attributes"/>
 					<xsd:attribute name="value" type="xforms:XPathExpression" use="optional"/>
 					<xsd:attributeGroup ref="xforms:XML.Events"/>
+					<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 				</xsd:extension>
 			</xsd:simpleContent>
 		</xsd:complexType>
@@ -657,12 +671,14 @@
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attribute name="submission" type="xsd:IDREF" use="required"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="reset">
 		<xsd:complexType>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 			<xsd:attribute name="model" type="xsd:IDREF" use="optional"/>
 			<!-- E4 -->
 		</xsd:complexType>
@@ -681,6 +697,7 @@
 				</xsd:simpleType>
 			</xsd:attribute>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="delete">
@@ -689,6 +706,7 @@
 			<xsd:attributeGroup ref="xforms:Nodeset.Binding.Attributes"/>
 			<xsd:attribute name="at" type="xforms:XPathExpression" use="required"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="setindex">
@@ -697,13 +715,18 @@
 			<xsd:attribute name="repeat" type="xsd:IDREF" use="required"/>
 			<xsd:attribute name="index" type="xforms:XPathExpression" use="required"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="toggle">
 		<xsd:complexType>
+			<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+				<xsd:element name="case" type="xforms:ValueTemplate"/>
+			</xsd:sequence>
 			<xsd:attributeGroup ref="xforms:Common.Attributes"/>
-			<xsd:attribute name="case" type="xsd:IDREF" use="required"/>
+			<xsd:attribute name="case" type="xsd:IDREF" use="optional"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="message">
@@ -726,6 +749,7 @@
 			</xsd:attribute>
 			<xsd:attributeGroup ref="xforms:Linking.Attributes"/>
 			<xsd:attributeGroup ref="xforms:XML.Events"/>
+			<xsd:attributeGroup ref="xforms:Common.Action.Attributes"/>
 		</xsd:complexType>
 	</xsd:element>
 	<!--=