diff --git a/doc/program.xml b/doc/program.xml
index 8ae90b5ab9346dd1899f858649ca355c627da792..eef23957dc93c25d8ac3d6eb12afdcde4dae8011 100644
--- a/doc/program.xml
+++ b/doc/program.xml
@@ -409,12 +409,15 @@ MySAX2Handler::fatalError(const SAXParseException& exception)
             <tr><td><em>Description</em></td><td> The XML Schema Recommendation explicitly states that
                         the inclusion of schemaLocation/ noNamespaceSchemaLocation attributes in the
                         instance document is only a hint; it does not mandate that these attributes
-                        must be used to locate schemas.  This property allows the user to specify a list
+                        must be used to locate schemas.  Similar situation happens to &lt;import&gt;
+                        element in schema documents. This property allows the user to specify a list
                         of schemas to use.  If the targetNamespace of a schema specified using this
-                        method matches the targetNamespace of a schema occuring in the instance document
-                        in the schemaLocation attribute, the schema specified by the user using this
-                        method will be used (i.e., the instance document's schemaLocation attribute
-                        will be effectively ignored).</td></tr>
+                        method matches the targetNamespace of a schema occurring in the instance
+                        document in schemaLocation attribute, or
+                        if the targetNamespace matches the namespace attribute of &lt;import&gt;
+                        element, the schema specified by the user using this property will
+                        be used (i.e., the schemaLocation attribute in the instance document
+                        or on the &lt;import&gt; element will be effectively ignored).</td></tr>
             <tr><td><em>Value</em></td><td> The syntax is the same as for schemaLocation attributes
                              in instance documents: e.g, "http://www.example.com file_name.xsd".
                              The user can specify more than one XML Schema in the list.</td></tr>
diff --git a/src/parsers/DOMParser.hpp b/src/parsers/DOMParser.hpp
index ee2d6cfdebd633aead432eeb835d8e2a36d2d64b..5f131086b884396952371139931fdf46d4906043 100644
--- a/src/parsers/DOMParser.hpp
+++ b/src/parsers/DOMParser.hpp
@@ -586,9 +586,10 @@ public :
       * This method allows the user to specify a list of schemas to use.
       * If the targetNamespace of a schema specified using this method matches
       * the targetNamespace of a schema occuring in the instance document in
-      * the schemaLocation attribute, the schema specified by the user using
-      * this method will be used (i.e., the instance document's schemaLocation
-      * attribute will be effectively ignored).
+      * the schemaLocation attribute, or if the targetNamespace matches the
+      * namespace attribute of the "import" element, the schema specified by the
+      * user using this method will be used (i.e., the schemaLocation attribute
+      * in the instance document or on the "import" element will be effectively ignored).
       *
       * If this method is called more than once, only the last one takes effect.
       *
diff --git a/src/parsers/IDOMParser.hpp b/src/parsers/IDOMParser.hpp
index 3bfda8a7a37cd8a8244f3205ff02037cd1e77cc7..238060ec619f0aa6f4c9667b976ff05e3ffb44de 100644
--- a/src/parsers/IDOMParser.hpp
+++ b/src/parsers/IDOMParser.hpp
@@ -610,9 +610,10 @@ public :
       * This method allows the user to specify a list of schemas to use.
       * If the targetNamespace of a schema specified using this method matches
       * the targetNamespace of a schema occuring in the instance document in
-      * the schemaLocation attribute, the schema specified by the user using
-      * this method will be used (i.e., the instance document's schemaLocation
-      * attribute will be effectively ignored).
+      * the schemaLocation attribute, or if the targetNamespace matches the
+      * namespace attribute of the "import" element, the schema specified by the
+      * user using this method will be used (i.e., the schemaLocation attribute
+      * in the instance document or on the "import" element will be effectively ignored).
       *
       * If this method is called more than once, only the last one takes effect.
       *
diff --git a/src/parsers/SAXParser.hpp b/src/parsers/SAXParser.hpp
index 2a04224362304f4a525ae1aef4aac6d849ca8c53..8a9ba7576b5038c1f3db607ac16ed640c3f6639c 100644
--- a/src/parsers/SAXParser.hpp
+++ b/src/parsers/SAXParser.hpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.22  2001/12/05 22:09:02  tng
+ * Update documentation for setExternalSchemaLocation and setExternalNoNamespaceSchemaLocation.
+ *
  * Revision 1.21  2001/11/20 18:51:44  tng
  * Schema: schemaLocation and noNamespaceSchemaLocation to be specified outside the instance document.  New methods setExternalSchemaLocation and setExternalNoNamespaceSchemaLocation are added (for SAX2, two new properties are added).
  *
@@ -506,9 +509,10 @@ public :
       * This method allows the user to specify a list of schemas to use.
       * If the targetNamespace of a schema specified using this method matches
       * the targetNamespace of a schema occuring in the instance document in
-      * the schemaLocation attribute, the schema specified by the user using
-      * this method will be used (i.e., the instance document's schemaLocation
-      * attribute will be effectively ignored).
+      * the schemaLocation attribute, or if the targetNamespace matches the
+      * namespace attribute of the "import" element, the schema specified by the
+      * user using this method will be used (i.e., the schemaLocation attribute
+      * in the instance document or on the "import" element will be effectively ignored).
       *
       * If this method is called more than once, only the last one takes effect.
       *