diff -u -r1.9 -r1.10
--- lcdd_fields.xsd	4 May 2006 20:48:44 -0000	1.9
+++ lcdd_fields.xsd	4 May 2006 21:32:53 -0000	1.10
@@ -13,7 +13,7 @@

       </xs:documentation>
     </xs:annotation>
     <xs:sequence>

-      <xs:element minOccurs="0" maxOccurs="1" ref="field" />

+      <xs:element minOccurs="0" maxOccurs="unbounded" ref="field" />

       <xs:element name="global_field" minOccurs="0" maxOccurs="1" type="GlobalFieldType" />
     </xs:sequence>
   </xs:complexType>

@@ -27,7 +27,7 @@

       </xs:documentation>
     </xs:annotation>
     <xs:sequence>

-      <xs:element name="fieldref" minOccurs="1" maxOccurs="1" type="ReferenceType" />

+      <xs:element name="fieldref" minOccurs="1" maxOccurs="unbounded" type="ReferenceType" />

     </xs:sequence>
   </xs:complexType>
 

@@ -40,30 +40,6 @@

   <xs:element name="field" type="FieldType">
   </xs:element>
 

-  <xs:complexType name="DipoleType">
-    <xs:complexContent>
-      <xs:extension base="FieldType">
-	<xs:sequence>
-	  <xs:element name="dipole_coeff" minOccurs="1" maxOccurs="unbounded">
-	    <xs:complexType>
-	      <xs:attribute name="value" type="xs:double" use="required"/>
-	    </xs:complexType>
-	  </xs:element>
-	</xs:sequence>
-	<xs:attribute name="zmin" type="xs:double" />
-	<xs:attribute name="zmax" type="xs:double" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="dipole" substitutionGroup="field" type="DipoleType">
-    <xs:annotation>
-      <xs:documentation>
-	Dipole field element.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-

   <xs:complexType name="SolenoidType">
     <xs:annotation>
       <xs:documentation>

@@ -92,6 +68,35 @@

     </xs:annotation>
   </xs:element>
 

+  <xs:complexType name="DipoleType">
+   <xs:annotation>
+      <xs:documentation>
+	Dipole field using simple polynomial fit with a variable number of coefficients.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="FieldType">
+	<xs:sequence>
+	  <xs:element name="dipole_coeff" minOccurs="1" maxOccurs="unbounded">
+	    <xs:complexType>
+	      <xs:attribute name="value" type="xs:double" use="required"/>
+	    </xs:complexType>
+	  </xs:element>
+	</xs:sequence>
+	<xs:attribute name="zmin" type="xs:double" />
+	<xs:attribute name="zmax" type="xs:double" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="dipole" substitutionGroup="field" type="DipoleType">
+    <xs:annotation>
+      <xs:documentation>
+	Dipole field element.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+

   <xs:complexType name="FieldMapType">
     <xs:annotation>
       <xs:documentation>

@@ -165,7 +170,7 @@

   <xs:element name="rz_field_map" substitutionGroup="field" type="RZFieldMapType">
     <xs:annotation>
       <xs:documentation>

-	Solenoidal field element

+	An RZ field map element.

       </xs:documentation>
     </xs:annotation>
   </xs:element>