--- modules/damieng/clean_xml/loncapa.xsd	2015/05/22 19:50:13	1.15
+++ modules/damieng/clean_xml/loncapa.xsd	2015/06/22 20:49:55	1.16
@@ -5107,13 +5107,19 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute default="reaction" name="options">
+      <xs:attribute name="options">
+        <xs:annotation>
+          <xs:documentation>
+            Comma-separated list of options:
+            reaction: is a reaction (note: setting this option is only useful for the editor, it does not change the resulting image)
+            border: draws a border around the image
+          </xs:documentation>
+        </xs:annotation>
         <xs:simpleType>
           <xs:union memberTypes="perl">
             <xs:simpleType>
               <xs:restriction base="xs:string">
-                <xs:enumeration value="reaction"/>
-                <xs:enumeration value="border"/>
+                <xs:pattern value="reaction|border|reaction\s*,\s*border|border\s*,\s*reaction"/>
               </xs:restriction>
             </xs:simpleType>
           </xs:union>