Move constraintError out of the constraint tag, rename to constraintErrorMessage.

1 files changed, 5 insertions, 11 deletions

diff --git a/data/schemata/interface_definition.rnc b/data/schemata/interface_definition.rnc
index a0d6bc1..ffad2af 100644
--- a/data/schemata/interface_definition.rnc
+++ b/data/schemata/interface_definition.rnc
@@ -45,11 +45,12 @@ children = element children
 # but whether they are used or not is implementation-defined
 properties = element properties
 {
-    help?,
-    constraint?,
+    help? &
+    constraint? &
+    (element constraintErrorMessage { text })? &
 
     # These are meaningful only for leaf nodes
-    valueHelp?,
+    valueHelp? &
     (multi | valueless)?
 }
 
@@ -80,8 +81,7 @@ ownerAttr = attribute owner
 # When multiple constraints are listed, they work as logical OR
 constraint = element constraint
 {
-    (regex | validator)+ &
-    errorMessage?
+    (regex | validator)+
 }
 
 # A constraint may be a regex pattern
@@ -109,12 +109,6 @@ validatorArgumentAttr = attribute argument
     text
 }
 
-# When validation fails, a message can be shown
-errorMessage = element errorMessage
-{
-    text
-}
-
 # Tag nodes are containers for nodes without predefined names, like network interfaces
 # or user names (e.g. "interfaces ethernet eth0" or "user jrandomhacker")
 # Tag nodes may	contain	node and leafNode elements, and also nameConstraint tags