diff --git a/doc/enumval.xml b/doc/enumval.xml
index 9592399275a427c6470a5809838401480c45246a..7c67b316ddbcb4d04f50a3829be75c34f9279fb0 100644
--- a/doc/enumval.xml
+++ b/doc/enumval.xml
@@ -4,14 +4,20 @@
<s1 title="&XercesCName; Sample 9: EnumVal">
<s2 title="EnumVal">
- <p>EnumVal shows how to enumerate the markup decls in a DTD Validator.</p>
+ <p>EnumVal shows how to enumerate the markup decls in a DTD Grammar.</p>
<s3 title="Running EnumVal">
<p>This program parses the specified XML file, then shows how to
- enumerate the contents of the validator pools. Essentially,
- shows how one can access the DTD information stored in internal
- data structures. To run EnumVal, enter the following </p>
-<source>EnumVal <XML file></source>
+ enumerate the contents of the DTD Grammar.</p>
+<source>
+Usage:
+ EnumVal <XML file>
+
+This program parses the specified XML file, then shows how to
+enumerate the contents of the DTD Grammar. Essentially,
+shows how one can access the DTD information stored in internal
+data structures.
+</source>
<p>Here is a sample output from EnumVal</p>
<source>cd &XercesCInstallDir;-linux/samples/data
EnumVal personal.xml
diff --git a/doc/samples.xml b/doc/samples.xml
index 5c72dc79da8007d78dc9c2c36238f87d194ba08b..da65912492a4db6b2b33d8734a244e898b2b0012 100644
--- a/doc/samples.xml
+++ b/doc/samples.xml
@@ -54,9 +54,9 @@
<li><link idref="stdinparse">StdInParse</link>
<br/>StdInParse demonstrates streaming XML data from standard input.</li>
<li><link idref="enumval">EnumVal</link>
- <br/>EnumVal shows how to enumerate the markup decls in a DTD Validator.</li>
+ <br/>EnumVal shows how to enumerate the markup decls in a DTD Grammar.</li>
<li><link idref="senumval">SEnumVal</link>
- <br/>SEnumVal shows how to enumerate the markup decls in a Schema Validator.</li>
+ <br/>SEnumVal shows how to enumerate the markup decls in a Schema Grammar.</li>
<li><link idref="createdoc">CreateDOMDocument</link>
<br/>CreateDOMDocument creates a DOM tree in memory from scratch.</li>
<li><link idref="sax2count">SAX2Count</link>
diff --git a/doc/senumval.xml b/doc/senumval.xml
index 6b3d3496308e247286bfaa971e905d4ff6ab6748..11690516cbe11fde28522e2d85a31bc81af841d7 100644
--- a/doc/senumval.xml
+++ b/doc/senumval.xml
@@ -4,14 +4,19 @@
<s1 title="&XercesCName; Sample 9: SEnumVal">
<s2 title="SEnumVal">
- <p>SEnumVal shows how to enumerate the markup decls in a DTD Validator.</p>
+ <p>SEnumVal shows how to enumerate the markup decls in a Schema Grammar.</p>
<s3 title="Running SEnumVal">
<p>This program parses the specified XML file, then shows how to
- enumerate the contents of the validator pools. Essentially,
- shows how one can access the Schema information stored in internal
- data structures. To run SEnumVal, enter the following </p>
-<source>SEnumVal <XML file></source>
+ enumerate the contents of the Schema Grammar. </p>
+<source>
+Usage:
+ SEnumVal <XML file>
+
+This program parses a file, then shows how to enumerate the
+contents of the Schema Grammar. Essentially, shows how one can
+access the Schema information stored in internal data structures.
+</source>
<p>Here is a sample output from SEnumVal</p>
<source>cd &XercesCInstallDir;-linux/samples/data
SEnumVal personal-schema.xml
@@ -40,23 +45,23 @@ SEnumVal personal-schema.xml
Base Datatype: Decimal
Facets:
fractionDigits=0
-
+
Name: id
Type: ID
Default Type: #REQUIRED
Base Datatype: ID
-
+
Name: contr
Type: CDATA
Default Type: #DEFAULT
Value: false
Base Datatype: string
-
+
Name: note
Type: CDATA
Default Type: #IMPLIED
Base Datatype: string
-
+
--------------------------------------------
Name: name
Model Type: Children
@@ -94,7 +99,7 @@ SEnumVal personal-schema.xml
Default Type: #DEFAULT
Value: http://
Base Datatype: string
-
+
--------------------------------------------
Name: link
Model Type: Empty
@@ -107,12 +112,12 @@ SEnumVal personal-schema.xml
Type: IDREFS
Default Type: #IMPLIED
Base Datatype: List
-
+
Name: manager
Type: IDREF
Default Type: #IMPLIED
Base Datatype: IDREF
-
+
--------------------------------------------
</source>
</s3>
diff --git a/samples/EnumVal/EnumVal.cpp b/samples/EnumVal/EnumVal.cpp
index 77a135a1f53c9c523e401e2b33829d4871514ddd..0075bb186a877172f43aea5de3410a9d1b0b5978 100644
--- a/samples/EnumVal/EnumVal.cpp
+++ b/samples/EnumVal/EnumVal.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.15 2001/11/22 14:47:54 tng
+ * Use the phrase "Grammar" instead of "Validator" in EnumVal and SEnumVal Description.
+ *
* Revision 1.14 2001/10/25 15:18:33 tng
* delete the parser before XMLPlatformUtils::Terminate.
*
@@ -179,7 +182,7 @@ static void usage()
cout << "\nUsage:\n"
" EnumVal <XML file>\n\n"
"This program parses the specified XML file, then shows how to\n"
- "enumerate the contents of the validator pools. Essentially,\n"
+ "enumerate the contents of the DTD Grammar. Essentially,\n"
"shows how one can access the DTD information stored in internal\n"
"data structures.\n"
<< endl;
diff --git a/samples/SEnumVal/SEnumVal.cpp b/samples/SEnumVal/SEnumVal.cpp
index 68e4c830edd1576ec1f63bb1fd19d83d75519369..37831357f3e7bd2bc2afd98a2f1ef6d2ace2529e 100644
--- a/samples/SEnumVal/SEnumVal.cpp
+++ b/samples/SEnumVal/SEnumVal.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.5 2001/11/22 14:47:48 tng
+ * Use the phrase "Grammar" instead of "Validator" in EnumVal and SEnumVal Description.
+ *
* Revision 1.4 2001/11/21 22:09:49 peiyongz
* Copy Right date
*
@@ -87,9 +90,9 @@ static void usage();
void process(char* const);
void processAttributes( XMLAttDefList& attList, bool margin = false );
-void processDatatypeValidator( const DatatypeValidator*, bool margin = false
+void processDatatypeValidator( const DatatypeValidator*, bool margin = false
);
-void processContentSpecNode( const ContentSpecNode* specNode, bool margin =
+void processContentSpecNode( const ContentSpecNode* specNode, bool margin =
false );
// ---------------------------------------------------------------------------
@@ -146,9 +149,8 @@ static void usage()
cout << "\nUsage:\n"
" SEnumVal <XML file>\n\n"
"This program parses a file, then shows how to enumerate the\n"
- "contents of the validator pools. Essentially, shows how one can\n"
- "access the Schema information stored in internal data structures.\n\n"
- " * = Default if not provided explicitly\n"
+ "contents of the Schema Grammar. Essentially, shows how one can\n"
+ "access the Schema information stored in internal data structures.\n"
<< endl;
}
diff --git a/scripts/sanityTest_ExpectedResult.log b/scripts/sanityTest_ExpectedResult.log
index 70c236ad318128bd9a9c38e5e0ded10686396424..894d0a3f2668eba12f22bce5fafdba616d890c7c 100644
--- a/scripts/sanityTest_ExpectedResult.log
+++ b/scripts/sanityTest_ExpectedResult.log
@@ -764,7 +764,7 @@ Usage:
EnumVal <XML file>
This program parses the specified XML file, then shows how to
-enumerate the contents of the validator pools. Essentially,
+enumerate the contents of the DTD Grammar. Essentially,
shows how one can access the DTD information stored in internal
data structures.
@@ -807,11 +807,9 @@ Usage:
SEnumVal <XML file>
This program parses a file, then shows how to enumerate the
-contents of the validator pools. Essentially, shows how one can
+contents of the Schema Grammar. Essentially, shows how one can
access the Schema information stored in internal data structures.
- * = Default if not provided explicitly
-
Name: personnel
Model Type: Children
Create Reason: Declared