cluster: STABLE3 - config: Clean up recursion and documentation
Lon Hohberger
lon at fedoraproject.org
Mon Jun 21 18:19:29 UTC 2010
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=95c23b7469b4169e58589c6d7571b56f62abd75a
Commit: 95c23b7469b4169e58589c6d7571b56f62abd75a
Parent: fb97a2002e50f8fc99cc97e5023d7a866dff5b7a
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Tue Jun 15 15:44:23 2010 -0400
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Jun 21 14:18:49 2010 -0400
config: Clean up recursion and documentation
Resolves: rhbz#604298
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
config/tools/xml/cluster.rng.in | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 8438d4c..cc29617 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -892,7 +892,7 @@ To validate your cluster.conf against this schema, run:
</element>
</optional> <!-- End of events block -->
<optional>
- <element name="resources" rha:description="Defines global resources.">
+ <element name="resources" rha:description="Defines global resources which may be referenced in services. You may redefine actions for resources here, but child resource definitions are ignored in this section.">
<zeroOrMore>
<ref name="CHILDREN"/>
</zeroOrMore>
@@ -1968,8 +1968,7 @@ To validate your cluster.conf against this schema, run:
</element>
</define>
- <define name="CHILD">
- <!-- for recursion to work properly, CHILD may be referenced at CHILDREN only -->
+ <define name="CHILDREN">
<zeroOrMore>
<choice>
@@ -1999,14 +1998,6 @@ To validate your cluster.conf against this schema, run:
</zeroOrMore>
</define>
- <define name="CHILDREN">
- <zeroOrMore>
- <choice>
- <ref name="CHILD"/>
- </choice>
- </zeroOrMore>
- </define>
-
<define name="RESOURCEACTION">
<zeroOrMore>
<element name="action" rha:description="Overrides resource action timings for a resource instance.">
More information about the cluster-commits
mailing list