summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
Diffstat (limited to 'schema')
-rw-r--r--schema/interface_definition.rng5
-rw-r--r--schema/op-mode-definition.rnc5
-rw-r--r--schema/op-mode-definition.rng10
3 files changed, 9 insertions, 11 deletions
diff --git a/schema/interface_definition.rng b/schema/interface_definition.rng
index 5a0a48845..d1bd9a708 100644
--- a/schema/interface_definition.rng
+++ b/schema/interface_definition.rng
@@ -169,11 +169,6 @@
</element>
</optional>
<optional>
- <element name="type">
- <text/>
- </element>
- </optional>
- <optional>
<!-- These are meaningful only for tag nodes -->
<group>
<element name="keepChildOrder">
diff --git a/schema/op-mode-definition.rnc b/schema/op-mode-definition.rnc
index 01276123c..9c84de0e4 100644
--- a/schema/op-mode-definition.rnc
+++ b/schema/op-mode-definition.rnc
@@ -52,8 +52,7 @@ tagNode = element tagNode
leafNode = element leafNode
{
nodeNameAttr,
- command,
- properties
+ (command & properties)
}
# Normal and tag nodes may have children
@@ -105,4 +104,4 @@ completionHelp = element completionHelp
(element list { text })* &
(element path { text })* &
(element script { text })*
-} \ No newline at end of file
+}
diff --git a/schema/op-mode-definition.rng b/schema/op-mode-definition.rng
index 98a231e53..e9e7887cf 100644
--- a/schema/op-mode-definition.rng
+++ b/schema/op-mode-definition.rng
@@ -67,7 +67,9 @@
<optional>
<ref name="properties"/>
</optional>
- <ref name="children"/>
+ <optional>
+ <ref name="children"/>
+ </optional>
<optional>
<ref name="command"/>
</optional>
@@ -81,8 +83,10 @@
<define name="leafNode">
<element name="leafNode">
<ref name="nodeNameAttr"/>
- <ref name="command"/>
- <ref name="properties"/>
+ <interleave>
+ <ref name="command"/>
+ <ref name="properties"/>
+ </interleave>
</element>
</define>
<!-- Normal and tag nodes may have children -->