Merge branch 'backport' into work

[dana/openbox.git] / data / menu.xsd

diff --git a/data/menu.xsd b/data/menu.xsd
index f9d008d..e3e1e17 100644 (file)
--- a/data/menu.xsd
+++ b/data/menu.xsd
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-     xml Schema for the openbox windowmanager menu file
 
-     Changes:
-     Don Aug 14 21:10:27 CEST 2003 - pch(a)myzel.net
-         split from rc3.xsd
-     Mon Sep  8 12:33:57 CEST 2003 - pch(a)myzel.net
-         up to beta1
-     Die Sep 16 21:22:59 CEST 2003 - pch(a)myzel.net
-         use a namespace
-     Fri Sep 19 14:36:33 EDT 2003 - xor(a)orodu.net
-         use openbox.org for namespace
--->
+<!-- XML Schema for the Openbox window manager menu file -->
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
+    targetNamespace="http://openbox.org/3.4/menu"
+    xmlns:ob="http://openbox.org/3.4/menu"
     elementFormDefault="qualified">
     <!--
          root node
@@ -36,6 +26,7 @@
             <xs:element maxOccurs="unbounded" minOccurs="0" name="separator" type="ob:empty"/>
         </xs:choice>
         <xs:attribute name="label" type="xs:string" use="optional"/>
+        <xs:attribute name="execute" type="xs:string" use="optional"/>
         <xs:attribute name="id" type="xs:string" use="required"/>
     </xs:complexType>
     <xs:complexType name="empty">
@@ -61,10 +52,10 @@
       -->
     <xs:simpleType name="actionname">
         <xs:restriction base="xs:string">
-            <xs:enumeration value="execute"/>
-            <xs:enumeration value="restart"/>
-            <xs:enumeration value="reconfigure"/>
-            <xs:enumeration value="exit"/>
+            <xs:enumeration value="Execute"/>
+            <xs:enumeration value="Restart"/>
+            <xs:enumeration value="Reconfigure"/>
+            <xs:enumeration value="Exit"/>
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>