diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index 73714c9feeb1aa7679702ed6470e10220badd8f4..271f0086deda1173ad26ca10ac2cbe0064ff255d 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -519,7 +519,7 @@
             <Message Id="UTF8_Invalid_3BytesSeq"   Text="invalid bytes '{0}' and '{1}' of a 3-byte sequence"/>
             <Message Id="UTF8_Irregular_3BytesSeq" Text="irregular bytes '{0}' and '{1}' of a 3-byte sequence"/>
             <Message Id="UTF8_Invalid_4BytesSeq"   Text="invalid bytes '{0}' and '{1}' of a 4-byte sequence"/>
-            <Message Id="UTF8_Exceede_BytesLimit"  Text="exceeded byte limit at byte '{0}' in a {1}-byte sequence"/>
+            <Message Id="UTF8_Exceeds_BytesLimit"  Text="exceeded byte limit at byte '{0}' in a {1}-byte sequence"/>
             <Message Id="Vector_BadIndex" Text="index is beyond vector bounds"/>
             <Message Id="Val_InvalidElemId" Text="invalid element id"/>
             <Message Id="Val_CantHaveIntSS" Text="internal subset is not allowed when reusing the grammar"/>
diff --git a/src/xercesc/dom/DOMConfiguration.hpp b/src/xercesc/dom/DOMConfiguration.hpp
index 135d20507ab2283cad702e8480b99331324ed47b..bbd88092e4061ab61cc10f0da167086638fb82b1 100644
--- a/src/xercesc/dom/DOMConfiguration.hpp
+++ b/src/xercesc/dom/DOMConfiguration.hpp
@@ -43,7 +43,7 @@ XERCES_CPP_NAMESPACE_BEGIN
  *   boolean     (boolean    parameters)    and    DOMUserData
  *   (parameters). The names used by the DOMConfiguration object are
  *   defined  throughout  the  DOM Level 3 specifications. Names are
- *   case-insensitives.   To   avoid   possible   conflicts,   as  a
+ *   case-insensitive.   To   avoid   possible   conflicts,   as  a
  *   convention,   names   referring   to   boolean  parameters  and
  *   parameters defined outside the DOM specification should be made
  *   unique.  Names  are  recommended  to  follow the XML name
@@ -219,7 +219,7 @@ XERCES_CPP_NAMESPACE_BEGIN
  *               This   forces   the  following  features  to  true:
  *               whitespace-in-element-content,            comments,
  *               namespaces.
- *               Other  features  are  not  changed unless explicity
+ *               Other  features  are  not  changed unless explicitly
  *               specified in the description of the features.
  *               Note  that  querying  this  feature with getFeature
  *               returns   true  only  if  the  individual  features
diff --git a/src/xercesc/dom/DOMDocument.hpp b/src/xercesc/dom/DOMDocument.hpp
index e8102e85bd48a01bca8b23fa62d510b102bae7fd..ae8e65c445b3dacfa2484f8600feee1832b88a52 100644
--- a/src/xercesc/dom/DOMDocument.hpp
+++ b/src/xercesc/dom/DOMDocument.hpp
@@ -731,7 +731,7 @@ public:
      * updates the replacement tree of <code>DOMEntityReference</code> nodes,
      * normalizes attribute values, etc.
      * <br>Mutation events, when supported, are generated to reflect the
-     * changes occuring on the document.
+     * changes occurring on the document.
      * Note that this is a partial implementation. Not all the required features are implemented.
      * Currently <code>DOMAttr</code> and <code>DOMText</code> nodes are normalized.
      * Features to remove <code>DOMComment</code> and <code>DOMCDATASection</code> work.
diff --git a/src/xercesc/dom/DOMDocumentFragment.hpp b/src/xercesc/dom/DOMDocumentFragment.hpp
index 12a51a42d25a40e82c95e5448f1c86f12eddfd73..8c55042419633ace39913b39d667f59296ce07d8 100644
--- a/src/xercesc/dom/DOMDocumentFragment.hpp
+++ b/src/xercesc/dom/DOMDocumentFragment.hpp
@@ -38,7 +38,7 @@ XERCES_CPP_NAMESPACE_BEGIN
  * document by moving fragments around. It is desirable to have an object
  * which can hold such fragments and it is quite natural to use a DOMNode for
  * this purpose. While it is true that a <code>DOMDocument</code> object could
- * fulfil this role,  a <code>DOMDocument</code> object can potentially be a
+ * fulfill this role,  a <code>DOMDocument</code> object can potentially be a
  * heavyweight  object, depending on the underlying implementation. What is
  * really needed for this is a very lightweight object.
  * <code>DOMDocumentFragment</code> is such an object.
diff --git a/src/xercesc/dom/DOMErrorHandler.hpp b/src/xercesc/dom/DOMErrorHandler.hpp
index b2c8101bcc2b3b40d97a5d9711cf8a1c8d7c9c79..70e061ebd9ec2f57b39d8c26a871fdbe87efe77f 100644
--- a/src/xercesc/dom/DOMErrorHandler.hpp
+++ b/src/xercesc/dom/DOMErrorHandler.hpp
@@ -83,7 +83,7 @@ public:
     /** @name Functions introduced in DOM Level 3 */
     //@{
     /**
-     * This method is called on the error handler when an error occures.
+     * This method is called on the error handler when an error occurs.
      * If an exception is thrown from this method, it is considered to be equivalent of returning <code>true</code>.
      *
      * @param domError The error object that describes the error, this object
diff --git a/src/xercesc/dom/DOMException.hpp b/src/xercesc/dom/DOMException.hpp
index 514cdb95ae4bbdc519473d75d8ab2073d05bf25d..29dc152759d134eebbda2c654fb53d3569e045d0 100644
--- a/src/xercesc/dom/DOMException.hpp
+++ b/src/xercesc/dom/DOMException.hpp
@@ -54,7 +54,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * ExceptionCode
diff --git a/src/xercesc/dom/DOMImplementation.hpp b/src/xercesc/dom/DOMImplementation.hpp
index 638475fc06042f3711ad8d91d3480ddd17a3fe41..e03ee6932022dc74e6f95e703f67f6f18e99529f 100644
--- a/src/xercesc/dom/DOMImplementation.hpp
+++ b/src/xercesc/dom/DOMImplementation.hpp
@@ -57,7 +57,7 @@ private:
     // -----------------------------------------------------------------------
     /** @name Unimplemented constructors and operators */
     //@{
-        DOMImplementation(const DOMImplementation &);   // no copy construtor.
+        DOMImplementation(const DOMImplementation &);   // no copy constructor.
         DOMImplementation & operator = (const DOMImplementation &);  // No Assignment
     //@}
 
diff --git a/src/xercesc/dom/DOMImplementationLS.hpp b/src/xercesc/dom/DOMImplementationLS.hpp
index 56741c5c6f4430a50d3ba271e8e43e3b1a69a9f1..9687c667b5b2aa3f10778ee9108c7090f7562ddb 100644
--- a/src/xercesc/dom/DOMImplementationLS.hpp
+++ b/src/xercesc/dom/DOMImplementationLS.hpp
@@ -128,7 +128,7 @@ public:
      * Other Schema languages are outside the scope of the W3C and therefore should
      * recommend an absolute URI in order to use this method.
      * @param manager    Pointer to the memory manager to be used to allocate objects.
-     * @param gramPool   The collection of cached grammers.
+     * @param gramPool   The collection of cached grammars.
      * @return The newly created <code>DOMLSParser</code> object. This
      * <code>DOMLSParser</code> is either synchronous or asynchronous depending
      * on the value of the <code>mode</code> argument.
diff --git a/src/xercesc/dom/DOMNode.hpp b/src/xercesc/dom/DOMNode.hpp
index a11cf3b8040769af9316fc7cf2e03df8ddb5e508..447a948e31c46b5d45e79f7bd53c8df087a6af61 100644
--- a/src/xercesc/dom/DOMNode.hpp
+++ b/src/xercesc/dom/DOMNode.hpp
@@ -172,7 +172,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * NodeType
diff --git a/src/xercesc/dom/DOMNodeFilter.hpp b/src/xercesc/dom/DOMNodeFilter.hpp
index 58b3820a8497a8de9d8ceac5817c062d05825ea9..0373affef371f9a8717aae8fe134b38cdd0bf35f 100644
--- a/src/xercesc/dom/DOMNodeFilter.hpp
+++ b/src/xercesc/dom/DOMNodeFilter.hpp
@@ -83,7 +83,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * Constants returned by acceptNode.
diff --git a/src/xercesc/dom/DOMPSVITypeInfo.hpp b/src/xercesc/dom/DOMPSVITypeInfo.hpp
index 2347dd1720830d1b1f5652b8ecd24fa949f0219f..8ccd1fbe8e60aab1c98befb6f561f2ccf1fa87e8 100644
--- a/src/xercesc/dom/DOMPSVITypeInfo.hpp
+++ b/src/xercesc/dom/DOMPSVITypeInfo.hpp
@@ -57,7 +57,7 @@ public:
     enum PSVIProperty
     {
         PSVI_Validity
-        , PSVI_Validitation_Attempted
+        , PSVI_Validation_Attempted
         , PSVI_Type_Definition_Type
         , PSVI_Type_Definition_Name
         , PSVI_Type_Definition_Namespace
diff --git a/src/xercesc/dom/DOMRange.hpp b/src/xercesc/dom/DOMRange.hpp
index 1e091cedd607ff649490f7e5abc4aad462f0ab9e..3aec0de9397fa7efad6df73e2f27ae2bf0e0ef6c 100644
--- a/src/xercesc/dom/DOMRange.hpp
+++ b/src/xercesc/dom/DOMRange.hpp
@@ -69,7 +69,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * Constants CompareHow.
diff --git a/src/xercesc/dom/DOMRangeException.hpp b/src/xercesc/dom/DOMRangeException.hpp
index 427e81f5962a3e5826fc4d7f93c8f5632911d337..34eb34241901f7f1a17a4082f128b6f45914dc5d 100644
--- a/src/xercesc/dom/DOMRangeException.hpp
+++ b/src/xercesc/dom/DOMRangeException.hpp
@@ -38,7 +38,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * Enumerators for DOM Range Exceptions
diff --git a/src/xercesc/dom/DOMXPathNamespace.hpp b/src/xercesc/dom/DOMXPathNamespace.hpp
index 3bfc4046f76039c6e224bd6aaf72c5f81ef3ff6c..81f634f4fea61d7bf7693d727aabb7b457c131ac 100644
--- a/src/xercesc/dom/DOMXPathNamespace.hpp
+++ b/src/xercesc/dom/DOMXPathNamespace.hpp
@@ -48,7 +48,7 @@ class DOMElement;
  * nodeValue is the same as namespaceURI.
  * adoptNode, cloneNode, and importNode fail on this node type by raising a DOMException with the code NOT_SUPPORTED_ERR.
  * Note: In future versions of the XPath specification, the definition of a namespace node may
- * be changed incomatibly, in which case incompatible changes to field values may be required to
+ * be changed incompatibly, in which case incompatible changes to field values may be required to
  * implement versions beyond XPath 1.0.
  * @since DOM Level 3
  */
diff --git a/src/xercesc/dom/DOMXPathResult.hpp b/src/xercesc/dom/DOMXPathResult.hpp
index 520927c980e1a5d23967ac84d2eee97ed8e6b5d4..bc584b62256636d75d8834bc53ed137126cd45d1 100644
--- a/src/xercesc/dom/DOMXPathResult.hpp
+++ b/src/xercesc/dom/DOMXPathResult.hpp
@@ -81,7 +81,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class Types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * <p>ANY_TYPE
diff --git a/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp b/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp
index 7296ba8265d992c33a4bf7f3ef08e5533b6bc0b2..90786b12bfc3ac2d686a39948971ef227bcd68a5 100644
--- a/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp
+++ b/src/xercesc/dom/impl/DOMTypeInfoImpl.cpp
@@ -61,8 +61,8 @@ DOMTypeInfoImpl::DOMTypeInfoImpl(DOMDocumentImpl* ownerDoc, const DOMPSVITypeInf
 {
     setNumericProperty(DOMPSVITypeInfo::PSVI_Validity,
         sourcePSVI->getNumericProperty(DOMPSVITypeInfo::PSVI_Validity));
-    setNumericProperty(DOMPSVITypeInfo::PSVI_Validitation_Attempted,
-        sourcePSVI->getNumericProperty(DOMPSVITypeInfo::PSVI_Validitation_Attempted));
+    setNumericProperty(DOMPSVITypeInfo::PSVI_Validation_Attempted,
+        sourcePSVI->getNumericProperty(DOMPSVITypeInfo::PSVI_Validation_Attempted));
     setNumericProperty(DOMPSVITypeInfo::PSVI_Type_Definition_Type,
         sourcePSVI->getNumericProperty(DOMPSVITypeInfo::PSVI_Type_Definition_Type));
     setNumericProperty(DOMPSVITypeInfo::PSVI_Type_Definition_Anonymous,
@@ -141,7 +141,7 @@ int DOMTypeInfoImpl::getNumericProperty(PSVIProperty prop) const {
     switch(prop)
     {
     case PSVI_Validity:                         return (PSVIItem::VALIDITY_STATE)(fBitFields & 0x0003);
-    case PSVI_Validitation_Attempted:           return (PSVIItem::ASSESSMENT_TYPE)((fBitFields >> 2) & 0x0003);
+    case PSVI_Validation_Attempted:             return (PSVIItem::ASSESSMENT_TYPE)((fBitFields >> 2) & 0x0003);
     case PSVI_Type_Definition_Type:             return (fBitFields & (1 << 5))?XSTypeDefinition::COMPLEX_TYPE:XSTypeDefinition::SIMPLE_TYPE;
     case PSVI_Type_Definition_Anonymous:        return (fBitFields & (1 << 6))?true:false;
     case PSVI_Nil:                              return (fBitFields & (1 << 7))?true:false;
@@ -169,7 +169,7 @@ void DOMTypeInfoImpl::setNumericProperty(PSVIProperty prop, int value) {
     switch(prop)
     {
     case PSVI_Validity:                         fBitFields |= (value & 0x0003); break;
-    case PSVI_Validitation_Attempted:           fBitFields |= ((value & 0x0003) << 2); break;
+    case PSVI_Validation_Attempted:             fBitFields |= ((value & 0x0003) << 2); break;
     case PSVI_Type_Definition_Type:             fBitFields |= (value==XSTypeDefinition::COMPLEX_TYPE)?(1 << 5):0; break;
     case PSVI_Type_Definition_Anonymous:        fBitFields |= (value!=0)?(1 << 6):0; break;
     case PSVI_Nil:                              fBitFields |= (value!=0)?(1 << 7):0; break;
diff --git a/src/xercesc/framework/LocalFileFormatTarget.cpp b/src/xercesc/framework/LocalFileFormatTarget.cpp
index 30f54c7253a22402197ff53692c96fd9a4130c37..7744f766f635bd50b4d58d8169dd8d5ee4331858 100644
--- a/src/xercesc/framework/LocalFileFormatTarget.cpp
+++ b/src/xercesc/framework/LocalFileFormatTarget.cpp
@@ -99,7 +99,7 @@ void LocalFileFormatTarget::writeChars(const XMLByte* const toWrite
         // If we don't have enough space, see if we can grow the buffer.
         //
         if (fIndex + count > fCapacity && fCapacity < MAX_BUFFER_SIZE)
-          insureCapacity (count);
+          ensureCapacity (count);
 
         // If still not enough space, flush the buffer.
         //
@@ -127,7 +127,7 @@ void LocalFileFormatTarget::writeChars(const XMLByte* const toWrite
     return;
 }
 
-void LocalFileFormatTarget::insureCapacity(const XMLSize_t extraNeeded)
+void LocalFileFormatTarget::ensureCapacity(const XMLSize_t extraNeeded)
 {
     XMLSize_t newCap = fCapacity * 2;
 
diff --git a/src/xercesc/framework/LocalFileFormatTarget.hpp b/src/xercesc/framework/LocalFileFormatTarget.hpp
index 53095b0c3050b5b21ce9ca774065543a64671d83..9cae3d9bf7d65a2fe98966c3b264872e55eaf7be 100644
--- a/src/xercesc/framework/LocalFileFormatTarget.hpp
+++ b/src/xercesc/framework/LocalFileFormatTarget.hpp
@@ -65,7 +65,7 @@ private:
     // -----------------------------------------------------------------------
     //  Private helpers
     // -----------------------------------------------------------------------
-    void insureCapacity(const XMLSize_t extraNeeded);
+    void ensureCapacity(const XMLSize_t extraNeeded);
 
     // -----------------------------------------------------------------------
     //  Private data members
diff --git a/src/xercesc/framework/MemBufFormatTarget.cpp b/src/xercesc/framework/MemBufFormatTarget.cpp
index 74a8245abe104f4375241e8170c3476379da8d0d..0cc591918af5439dbe5a7373545a71fe20475f6d 100644
--- a/src/xercesc/framework/MemBufFormatTarget.cpp
+++ b/src/xercesc/framework/MemBufFormatTarget.cpp
@@ -55,7 +55,7 @@ void MemBufFormatTarget::writeChars(const XMLByte* const toWrite
     if (count)
     {
       if (fIndex + count >= fCapacity)
-        insureCapacity(count);
+        ensureCapacity(count);
 
       memcpy(&fDataBuf[fIndex], toWrite, count * sizeof(XMLByte));
       fIndex += count;
@@ -84,7 +84,7 @@ void MemBufFormatTarget::reset()
 // ---------------------------------------------------------------------------
 //  MemBufFormatTarget: Private helper methods
 // ---------------------------------------------------------------------------
-void MemBufFormatTarget::insureCapacity(const XMLSize_t extraNeeded)
+void MemBufFormatTarget::ensureCapacity(const XMLSize_t extraNeeded)
 {
     // Oops, not enough room. Calc new capacity and allocate new buffer
     const XMLSize_t newCap = ((fIndex + extraNeeded) * 2);
diff --git a/src/xercesc/framework/MemBufFormatTarget.hpp b/src/xercesc/framework/MemBufFormatTarget.hpp
index 08806ef5a3a3231f48c055ada853c64a93609e28..e6ac33f84e93978f498c12553abca055dd8608a6 100644
--- a/src/xercesc/framework/MemBufFormatTarget.hpp
+++ b/src/xercesc/framework/MemBufFormatTarget.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
  * may plug into DOMLSSerializer to retrieve the serialized XML stream (from DOM Tree)
  * in a memory buffer.
  *
- * The MemBufFormatTarget is initalized to have a memory buffer of 1023 upon
+ * The MemBufFormatTarget is initialized to have a memory buffer of 1023 upon
  * construction, which grows as needed. The buffer will be deleted when
  * MemBufFormatTarget is destructed; or will be reset when the reset() function
  * is called.
@@ -105,7 +105,7 @@ private:
     // -----------------------------------------------------------------------
     //  Private helpers
     // -----------------------------------------------------------------------
-    void insureCapacity(const XMLSize_t extraNeeded);
+    void ensureCapacity(const XMLSize_t extraNeeded);
 
     // -----------------------------------------------------------------------
     //  Private data members
diff --git a/src/xercesc/framework/MemBufInputSource.hpp b/src/xercesc/framework/MemBufInputSource.hpp
index e6413c10f00f45db941a7e9acbd0404b6b1a59ac..9bc7b5ad62a20fc93eec25636ad3e4e687fddb17 100644
--- a/src/xercesc/framework/MemBufInputSource.hpp
+++ b/src/xercesc/framework/MemBufInputSource.hpp
@@ -76,7 +76,7 @@ public :
       *
       * Note that the system id provided serves two purposes. Firstly it is
       * going to be displayed in error messages as the source of the error.
-      * And secondly, any entities which are refered to from this entity
+      * And secondly, any entities which are referred to from this entity
       * via relative paths/URLs will be relative to this fake system id.
       *
       * @param  srcDocBytes     The actual data buffer to be parsed from.
diff --git a/src/xercesc/framework/URLInputSource.hpp b/src/xercesc/framework/URLInputSource.hpp
index 479031ad104bdce234b24ec5dd6d478e99843ecc..0cdcfe2c4d62b11704af0e8f8dbe592ddb03e8dd 100644
--- a/src/xercesc/framework/URLInputSource.hpp
+++ b/src/xercesc/framework/URLInputSource.hpp
@@ -94,7 +94,7 @@ public :
     );
 
     /**
-     *  This constructor is indentical to the previous one, except that it also
+     *  This constructor is identical to the previous one, except that it also
      *  allows you to set a public id if you want to.
      *
      *  @param  baseId      The base system id URL which provides the base
@@ -182,7 +182,7 @@ public :
 
     /**
      * This method will return a binary input stream derivative that will
-     * parse from the source refered to by the URL system id.
+     * parse from the source referred to by the URL system id.
      */
     BinInputStream* makeStream() const;
 
diff --git a/src/xercesc/framework/Wrapper4InputSource.hpp b/src/xercesc/framework/Wrapper4InputSource.hpp
index 2aaf07bfb43d1b162096aa9e00033d23e1360e9e..9c88699142f649a0d7e065270acfc865e31b9b2e 100644
--- a/src/xercesc/framework/Wrapper4InputSource.hpp
+++ b/src/xercesc/framework/Wrapper4InputSource.hpp
@@ -87,7 +87,7 @@ public:
     //@{
   /**
     * An input source can be set to force the parser to assume a particular
-    * encoding for the data that input source reprsents, via the setEncoding()
+    * encoding for the data that input source represents, via the setEncoding()
     * method. This method will delegate to the wrapped input source to return
     * name of the encoding that is to be forced. If the encoding has never
     * been forced, it returns a null pointer.
diff --git a/src/xercesc/framework/XMLAttDef.hpp b/src/xercesc/framework/XMLAttDef.hpp
index 76934065fb14109e2f937e120e67e16894313d99..f5e479d8f9d7269fd2cb062404bfa051399c1da4 100644
--- a/src/xercesc/framework/XMLAttDef.hpp
+++ b/src/xercesc/framework/XMLAttDef.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 
 class XMLAttr;
 
-/** Represents the core information of an atribute definition
+/** Represents the core information of an attribute definition
  *
  *  This class defines the basic characteristics of an attribute, no matter
  *  what type of validator is used. If a particular schema associates more
@@ -130,7 +130,7 @@ public:
 
     /** Get a string representation of the passed attribute type enum
       *
-      * This method allows you to get a textual representation of an attriubte
+      * This method allows you to get a textual representation of an attribute
       * type, mostly for debug or display.
       *
       * @param attrType The attribute type value to get the string for.
@@ -216,7 +216,7 @@ public:
 
     /** Get the enumeration value (if any) of this attribute type
       *
-      * If the attribute is of an enumeration or notatin type, then this
+      * If the attribute is of an enumeration or notation type, then this
       * method will return a const reference to a string that contains the
       * space separated values that can the attribute can have.
       *
@@ -238,7 +238,7 @@ public:
     /** Get the type of this attribute
       *
       * Gets the type of this attribute. This type is represented by an enum
-      * that convers the types of attributes allowed by XML, e.g. CDATA, NMTOKEN,
+      * that converts the types of attributes allowed by XML, e.g. CDATA, NMTOKEN,
       * NOTATION, etc...
       *
       * @return The attribute type enumeration value for this type of
diff --git a/src/xercesc/framework/XMLAttDefList.hpp b/src/xercesc/framework/XMLAttDefList.hpp
index 32cd54ee3726b8558b2676928fdcf4aee50c41d7..f0353a9379c8c8a5b8ecea51e981c3ed80977bda 100644
--- a/src/xercesc/framework/XMLAttDefList.hpp
+++ b/src/xercesc/framework/XMLAttDefList.hpp
@@ -117,7 +117,7 @@ public:
     /** Get the memory manager
       *
       * This method returns the configurable memory manager used by the
-      * element declaration for dynamic allocation/deacllocation.
+      * element declaration for dynamic allocation/deallocation.
       *
       * @return the memory manager
       */
diff --git a/src/xercesc/framework/XMLAttr.hpp b/src/xercesc/framework/XMLAttr.hpp
index 5406a3034a842d3b31aa6bd079476944daa64026..27a1ecb8e04539a75a8bbef40efd0e9c64f4cb2a 100644
--- a/src/xercesc/framework/XMLAttr.hpp
+++ b/src/xercesc/framework/XMLAttr.hpp
@@ -169,7 +169,7 @@ public:
     //@{
 
     /**
-      * This methode returns the attribute name in a QName format.
+      * This method returns the attribute name in a QName format.
       */
     QName* getAttName() const;
 
diff --git a/src/xercesc/framework/XMLBuffer.cpp b/src/xercesc/framework/XMLBuffer.cpp
index 4fa699a3a94043a0022928f8a28c374c1a89d1f9..5ae3a141b6832f06291407faab1fc8c91e6e010c 100644
--- a/src/xercesc/framework/XMLBuffer.cpp
+++ b/src/xercesc/framework/XMLBuffer.cpp
@@ -33,7 +33,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  XMLBuffer: Buffer management
 // ---------------------------------------------------------------------------
 
-void XMLBuffer::insureCapacity(const XMLSize_t extraNeeded)
+void XMLBuffer::ensureCapacity(const XMLSize_t extraNeeded)
 {    
     // If we can't handle it, try doubling the buffer size.
     XMLSize_t newCap = (fIndex + extraNeeded) * 2;
diff --git a/src/xercesc/framework/XMLBuffer.hpp b/src/xercesc/framework/XMLBuffer.hpp
index ee854bf17ff89cafaafc8e7e35c43914a42ea62a..1062f6d5d2d62d4afe213d33f81e1d9d1bad4afe 100644
--- a/src/xercesc/framework/XMLBuffer.hpp
+++ b/src/xercesc/framework/XMLBuffer.hpp
@@ -90,13 +90,13 @@ public :
             // For example, say fullSize = 100 and fCapacity is 1023 (the default).
             // If the fIndex is less than the fullSize, then no problem.  We can just carry
             // on by resetting fCapacity to fullsize and proceed business as usual.
-            // If the fIndex is already bigger than the fullSize then we call insureCapacity
+            // If the fIndex is already bigger than the fullSize then we call ensureCapacity
             // to see if it can handle emptying the current buffer (it will throw an
             // exception if it can't).
             if (fullSize < fCapacity) {
                 fCapacity = fullSize;
                 if (fIndex >= fullSize) {
-                    insureCapacity(0);
+                    ensureCapacity(0);
                 }
             }
         }
@@ -113,7 +113,7 @@ public :
     {
         // Put in char and bump the index
         if (fIndex == fCapacity)
-            insureCapacity(1);
+            ensureCapacity(1);
         fBuffer[fIndex++] = toAppend;
     }
 
@@ -121,7 +121,7 @@ public :
     {
         if (count) {
             if (fIndex + count >= fCapacity) {
-                insureCapacity(count);
+                ensureCapacity(count);
             }
             memcpy(&fBuffer[fIndex], chars, count * sizeof(XMLCh));
             fIndex += count;
@@ -139,7 +139,7 @@ public :
             for (; *(chars+count); count++ ) /*noop*/;
 
             if (fIndex + count >= fCapacity) {
-                insureCapacity(count);
+                ensureCapacity(count);
             }
             memcpy(&fBuffer[fIndex], chars, count * sizeof(XMLCh));
             fIndex += count;
@@ -217,7 +217,7 @@ private :
     // -----------------------------------------------------------------------
     //  Private helpers
     // -----------------------------------------------------------------------
-    void insureCapacity(const XMLSize_t extraNeeded);
+    void ensureCapacity(const XMLSize_t extraNeeded);
 
 
     // -----------------------------------------------------------------------
diff --git a/src/xercesc/framework/XMLElementDecl.hpp b/src/xercesc/framework/XMLElementDecl.hpp
index ab0323ca2d8100f95148f15a8a6f600fd1f41175..450136236f8238969c47516b5a5d010ad5a42d82 100644
--- a/src/xercesc/framework/XMLElementDecl.hpp
+++ b/src/xercesc/framework/XMLElementDecl.hpp
@@ -313,7 +313,7 @@ class XMLPARSER_EXPORT XMLElementDecl : public XSerializable, public XMemory
     /** Get the memory manager
       *
       * This method returns the configurable memory manager used by the
-      * element declaration for dynamic allocation/deacllocation.
+      * element declaration for dynamic allocation/deallocation.
       *
       * @return the memory manager
       */
@@ -371,8 +371,8 @@ class XMLPARSER_EXPORT XMLElementDecl : public XSerializable, public XMemory
       * decl object. As the validator parses its DTD, Schema, etc... it will
       * encounter various references to an element declaration, which will
       * cause the element declaration to either be declared or to be faulted
-      * into the pool in preperation for some future declaration. As it does
-      * so,it will update this field to indicate the current satus of the
+      * into the pool in preparation for some future declaration. As it does
+      * so,it will update this field to indicate the current status of the
       * decl object.
       */
     void setCreateReason(const CreateReasons newReason);
@@ -398,7 +398,7 @@ class XMLPARSER_EXPORT XMLElementDecl : public XSerializable, public XMemory
     //  Miscellaneous methods
     // -----------------------------------------------------------------------
 
-    /** @name Miscellenous methods */
+    /** @name Miscellaneous methods */
     //@{
 
     //@}
diff --git a/src/xercesc/framework/XMLEntityDecl.hpp b/src/xercesc/framework/XMLEntityDecl.hpp
index 317be23775633a0906096f25a6431e9898112ea7..25c604908123417bb0bf0bfc326376deabb50008 100644
--- a/src/xercesc/framework/XMLEntityDecl.hpp
+++ b/src/xercesc/framework/XMLEntityDecl.hpp
@@ -58,7 +58,7 @@ public:
     //@{
 
     /**
-      *  Deafult Constructor
+      *  Default Constructor
       */
     XMLEntityDecl(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
 
@@ -208,7 +208,7 @@ public:
 
     /**
       * Indicates that this entity is an external entity. If not, then it is
-      * assumed to be an internal entity, suprise.
+      * assumed to be an internal entity, surprise.
       */
     bool isExternal() const;
 
@@ -351,7 +351,7 @@ private :
     //      This is the unique id given to this entity decl.
     //
     //  fName
-    //      The name of the enitity. Entity names are never namespace based.
+    //      The name of the entity. Entity names are never namespace based.
     //
     //  fNotationName
     //      The optional notation of the entity. If there was none, then its
diff --git a/src/xercesc/framework/XMLFormatter.hpp b/src/xercesc/framework/XMLFormatter.hpp
index d6238d98801379116b04ac0e264742850cd5977d..af3845ce94d60f17b7b158cbc53796c930e41501 100644
--- a/src/xercesc/framework/XMLFormatter.hpp
+++ b/src/xercesc/framework/XMLFormatter.hpp
@@ -44,7 +44,7 @@ public:
     // -----------------------------------------------------------------------
     //  Class types
     // -----------------------------------------------------------------------
-    /** @name Public Contants */
+    /** @name Public Constants */
     //@{
     /**
      * EscapeFlags - Different styles of escape flags to control various formatting.
@@ -271,7 +271,7 @@ public:
     inline const XMLTranscoder*   getTranscoder() const;
 
     /**
-     * @return return the transcoder used internally for transcoding the formatter conent
+     * @return return the transcoder used internally for transcoding the formatter content
      */
     inline XMLTranscoder*   getTranscoder();
 
diff --git a/src/xercesc/framework/XMLRefInfo.hpp b/src/xercesc/framework/XMLRefInfo.hpp
index 5c98ab2d8ae960b51e623ed8e2c83a824167572f..f2c71371d47d579b06149a2cb009e3c0f69b68ca 100644
--- a/src/xercesc/framework/XMLRefInfo.hpp
+++ b/src/xercesc/framework/XMLRefInfo.hpp
@@ -32,7 +32,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 
 /**
  *  This class provides a simple means to track ID Ref usage. Since id/idref
- *  semamatics are part of XML 1.0, any validator will likely to be able to
+ *  semantics are part of XML 1.0, any validator will likely to be able to
  *  track them. Instances of this class represent a reference and two markers,
  *  one for its being declared and another for its being used. When the
  *  document is done, one can look at each instance and, if used but not
diff --git a/src/xercesc/framework/XMLValidator.hpp b/src/xercesc/framework/XMLValidator.hpp
index 8de2a240e737c22ebd47863c1e8391740ce7cb3c..959483ce1ad62fb0cf91d32780fafe6d44b2bcbc 100644
--- a/src/xercesc/framework/XMLValidator.hpp
+++ b/src/xercesc/framework/XMLValidator.hpp
@@ -110,7 +110,7 @@ public:
 
     /**
       * The derived class should fault in the passed XMLAttr value. It should
-      * use the passed attribute definition (which is passed via the base
+      * use the passeed attribute definition (which is passed via the base
       * type so it must often be downcast to the appropriate type for the
       * derived validator class), to fill in the passed attribute. This is done
       * as a performance enhancement since the derived class has more direct
@@ -139,7 +139,7 @@ public:
 
     /**
       * This method is called by the scanner before a new document is about
-      * to start. It gives the validator a change to reset itself in preperation
+      * to start. It gives the validator a change to reset itself in preparation
       * for another validation pass.
       */
     virtual void reset() = 0;
diff --git a/src/xercesc/framework/psvi/PSVIAttributeList.hpp b/src/xercesc/framework/psvi/PSVIAttributeList.hpp
index 77d7d3972f05ee10b88e22ba7840475f8c48dfc9..2e0c59e87b4743ca1e5642ed2a85afa626f2cc62 100644
--- a/src/xercesc/framework/psvi/PSVIAttributeList.hpp
+++ b/src/xercesc/framework/psvi/PSVIAttributeList.hpp
@@ -92,7 +92,7 @@ public:
 
     /*
      * Get the PSVI contribution of attribute at position i
-     * in this list.  Indeces start from 0.
+     * in this list.  Indices start from 0.
      * @param index index from which the attribute PSVI contribution
      * is to come.
      * @return PSVIAttribute containing the attributes PSVI contributions;
@@ -102,7 +102,7 @@ public:
 
     /*
      * Get local part of attribute name at position index in the list.
-     * Indeces start from 0.
+     * Indices start from 0.
      * @param index index from which the attribute name
      * is to come.
      * @return local part of the attribute's name; null is returned if the index
@@ -112,7 +112,7 @@ public:
 
     /*
      * Get namespace of attribute at position index in the list.
-     * Indeces start from 0.
+     * Indices start from 0.
      * @param index index from which the attribute namespace
      * is to come.
      * @return namespace of the attribute;
diff --git a/src/xercesc/framework/psvi/PSVIItem.hpp b/src/xercesc/framework/psvi/PSVIItem.hpp
index 5442f37ca8d6a548c1e9853bd64cd5cf70d93671..ab8a1351261326e96463daee62014343fab3b1ff 100644
--- a/src/xercesc/framework/psvi/PSVIItem.hpp
+++ b/src/xercesc/framework/psvi/PSVIItem.hpp
@@ -132,7 +132,7 @@ public:
 
     /**
      * A list of error codes generated from validation attempts. 
-     * Need to find all the possible subclause reports that need reporting
+     * Need to find all the possible sub-clause reports that need reporting
      * 
      * @return list of error codes
      */
diff --git a/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp b/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp
index db434153d29ee3d40059d92bcfa5dd4a88908520..dfc341cad1812737bfd6b1bbd8b24f6b867a4a45 100644
--- a/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp
+++ b/src/xercesc/framework/psvi/XSComplexTypeDefinition.hpp
@@ -160,7 +160,7 @@ public:
 
     /**
      * [prohibited substitutions]: a subset of {extension, restriction}
-     * @param toTest  Extention or restriction constants (see 
+     * @param toTest  Extension or restriction constants (see 
      *   <code>XSObject</code>). 
      * @return True if toTest is a prohibited substitution, otherwise 
      *   false.
diff --git a/src/xercesc/framework/psvi/XSValue.cpp b/src/xercesc/framework/psvi/XSValue.cpp
index d27ba20298111b3700300b0bdb11f64160c11595..caed61c835664a8e69d02431fcd578d4c197de68 100644
--- a/src/xercesc/framework/psvi/XSValue.cpp
+++ b/src/xercesc/framework/psvi/XSValue.cpp
@@ -1434,7 +1434,7 @@ XSValue::getActValDateTimes(const XMLCh*         const input_content
         retVal->fData.fValue.f_datetime.f_hour    = coreDate.fValue[XMLDateTime::Hour];
         retVal->fData.fValue.f_datetime.f_min     = coreDate.fValue[XMLDateTime::Minute];
         retVal->fData.fValue.f_datetime.f_second  = coreDate.fValue[XMLDateTime::Second];
-        retVal->fData.fValue.f_datetime.f_milisec = coreDate.fMiliSecond;
+        retVal->fData.fValue.f_datetime.f_milisec = coreDate.fMilliSecond;
 
         return retVal;
     }
diff --git a/src/xercesc/framework/psvi/XSValue.hpp b/src/xercesc/framework/psvi/XSValue.hpp
index 044af6ac71df1efc99c7dd803f28964a7bf7462e..2f131b93ee61af86bea51e6edd6dcd6ceeed5a8a 100644
--- a/src/xercesc/framework/psvi/XSValue.hpp
+++ b/src/xercesc/framework/psvi/XSValue.hpp
@@ -171,7 +171,7 @@ public:
       * Get the actual value, in the form of XSValue, for a given string of the
       * data type specified
       *
-      * Client application is responsible for the deleletion of the XSValue returned.
+      * Client application is responsible for the deletion of the XSValue returned.
       *
       * @param  content    raw data
       * @param  datatype   schema datatype
diff --git a/src/xercesc/internal/BinMemOutputStream.cpp b/src/xercesc/internal/BinMemOutputStream.cpp
index 56d64237535994e4bc6f64ba7487cea584c33500..a59ecd8300182c4481765328a254abc7614c3fac 100644
--- a/src/xercesc/internal/BinMemOutputStream.cpp
+++ b/src/xercesc/internal/BinMemOutputStream.cpp
@@ -53,7 +53,7 @@ void BinMemOutputStream::writeBytes( const XMLByte*     const      toGo
 
     if (maxToWrite) 
     {
-        insureCapacity(maxToWrite);
+        ensureCapacity(maxToWrite);
         memcpy(&fDataBuf[fIndex], toGo, maxToWrite * sizeof(XMLByte));
         fIndex += maxToWrite;
     }
@@ -91,7 +91,7 @@ XMLFilePos BinMemOutputStream::getSize() const
 // ---------------------------------------------------------------------------
 //  BinMemOutputStream: Private helper methods
 // ---------------------------------------------------------------------------
-void BinMemOutputStream::insureCapacity(const XMLSize_t extraNeeded)
+void BinMemOutputStream::ensureCapacity(const XMLSize_t extraNeeded)
 {
     // If we can handle it, do nothing yet
     if (fIndex + extraNeeded < fCapacity)
diff --git a/src/xercesc/internal/BinMemOutputStream.hpp b/src/xercesc/internal/BinMemOutputStream.hpp
index 73013c3e13960c1d9fe465697c97d29424847d7a..13e9885bb38e87368c2f90c8c4142e7a752311b3 100644
--- a/src/xercesc/internal/BinMemOutputStream.hpp
+++ b/src/xercesc/internal/BinMemOutputStream.hpp
@@ -71,7 +71,7 @@ private :
     // -----------------------------------------------------------------------
     //  Private helpers
     // -----------------------------------------------------------------------
-    void insureCapacity(const XMLSize_t extraNeeded);
+    void ensureCapacity(const XMLSize_t extraNeeded);
 
     // -----------------------------------------------------------------------
     //  Private data members
diff --git a/src/xercesc/parsers/AbstractDOMParser.cpp b/src/xercesc/parsers/AbstractDOMParser.cpp
index a2004f8e1c73ee3e29e147fddd9470eae6e95aa6..7b4129343104c292bd192b6672b47a502eb7824d 100644
--- a/src/xercesc/parsers/AbstractDOMParser.cpp
+++ b/src/xercesc/parsers/AbstractDOMParser.cpp
@@ -686,7 +686,7 @@ void AbstractDOMParser::handleElementPSVI(const XMLCh* const            localNam
     {
         DOMTypeInfoImpl* typeInfo=new (getDocument()) DOMTypeInfoImpl();
         typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validity, elementInfo->getValidity());
-        typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validitation_Attempted, elementInfo->getValidationAttempted());
+        typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validation_Attempted, elementInfo->getValidationAttempted());
         if(elementInfo->getTypeDefinition())
         {
             typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Type_Definition_Type, elementInfo->getTypeDefinition()->getTypeCategory());
@@ -745,7 +745,7 @@ void AbstractDOMParser::handleAttributesPSVI( const XMLCh* const            loca
             {
                 DOMTypeInfoImpl* typeInfo=new (getDocument()) DOMTypeInfoImpl();
                 typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validity, attrInfo->getValidity());
-                typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validitation_Attempted, attrInfo->getValidationAttempted());
+                typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Validation_Attempted, attrInfo->getValidationAttempted());
                 if(attrInfo->getTypeDefinition())
                 {
                     typeInfo->setNumericProperty(DOMPSVITypeInfo::PSVI_Type_Definition_Type, XSTypeDefinition::SIMPLE_TYPE);
diff --git a/src/xercesc/parsers/AbstractDOMParser.hpp b/src/xercesc/parsers/AbstractDOMParser.hpp
index bd227a625c35938d32bdd9ef2c596b3d1bbb090b..be4e0eacf7597f590074dada42293aa4b75397b5 100644
--- a/src/xercesc/parsers/AbstractDOMParser.hpp
+++ b/src/xercesc/parsers/AbstractDOMParser.hpp
@@ -85,7 +85,7 @@ public :
 
 
     // -----------------------------------------------------------------------
-    //  Constructors and Detructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
     /** @name Destructor */
     //@{
@@ -276,7 +276,7 @@ public :
       */
     bool getIncludeIgnorableWhitespace() const;
 
-   /** Get the set of Namespace/SchemaLocation that is specified externaly.
+   /** Get the set of Namespace/SchemaLocation that is specified externally.
       *
       * This method returns the list of Namespace/SchemaLocation that was
       * specified using setExternalSchemaLocation.
@@ -284,7 +284,7 @@ public :
       * The parser owns the returned string, and the memory allocated for
       * the returned string will be destroyed when the parser is deleted.
       *
-      * To ensure assessiblity of the returned information after the parser
+      * To ensure accessibility of the returned information after the parser
       * is deleted, callers need to copy and store the returned information
       * somewhere else.
       *
@@ -297,7 +297,7 @@ public :
       */
     XMLCh* getExternalSchemaLocation() const;
 
-   /** Get the noNamespace SchemaLocation that is specified externaly.
+   /** Get the noNamespace SchemaLocation that is specified externally.
       *
       * This method returns the no target namespace XML Schema Location
       * that was specified using setExternalNoNamespaceSchemaLocation.
@@ -305,7 +305,7 @@ public :
       * The parser owns the returned string, and the memory allocated for
       * the returned string will be destroyed when the parser is deleted.
       *
-      * To ensure assessiblity of the returned information after the parser
+      * To ensure accessibility of the returned information after the parser
       * is deleted, callers need to copy and store the returned information
       * somewhere else.
       *
@@ -573,7 +573,7 @@ public :
 
     /**
       * This method allows users to set the parser's behaviour when it
-      * encounters a validtion constraint error. If set to true, and the
+      * encounters a validation constraint error. If set to true, and the
       * the parser will treat validation error as fatal and will exit depends on the
       * state of "getExitOnFirstFatalError". If false, then it will
       * report the error and continue processing.
@@ -677,7 +677,7 @@ public :
       *
       * Full schema constraint checking includes those checking that may
       * be time-consuming or memory intensive. Currently, particle unique
-      * attribution constraint checking and particle derivation resriction checking
+      * attribution constraint checking and particle derivation restriction checking
       * are controlled by this option.
       *
       * The parser's default state is: false.
@@ -706,7 +706,7 @@ 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 targetNamespace of a schema occurring in the instance document in
       * 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
@@ -1043,7 +1043,7 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a Unicode string represting the path
+      * @param systemId A pointer to a Unicode string representing the path
       *                 to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -1075,7 +1075,7 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a regular native string represting
+      * @param systemId A pointer to a regular native string representing
       *                 the path to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -1708,7 +1708,7 @@ protected:
     //      Indicates whether entity reference nodes should be created.
     //
     //  fIncludeIgnorableWhitespace
-    //      Indicates whether ignorable whiltespace should be added to
+    //      Indicates whether ignorable whitespace should be added to
     //      the DOM tree for validating parsers.
     //
     //  fScanner
diff --git a/src/xercesc/parsers/SAX2XMLFilterImpl.hpp b/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
index 2a193b3ff01d672a5b2327e8f2c6329f852344ec..008d78ad75ffe222bf57b2cdc77c09f9d9700a5a 100644
--- a/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
@@ -109,7 +109,7 @@ public :
      * The parser owns the returned pointer.  The memory allocated for
      * the returned pointer will be destroyed when the parser is deleted.
      *
-     * To ensure assessiblity of the returned information after the parser
+     * To ensure accessibility of the returned information after the parser
      * is deleted, callers need to copy and store the returned information
      * somewhere else; otherwise you may get unexpected result.  Since the returned
      * pointer is a generic void pointer, see the SAX2 Programming Guide to learn
@@ -516,7 +516,7 @@ public :
 
     /**
       * This method allows users to set the parser's behaviour when it
-      * encounters a validtion constraint error. If set to true, and the
+      * encounters a validation constraint error. If set to true, and the
       * the parser will treat validation error as fatal and will exit depends on the
       * state of "getExitOnFirstFatalError". If false, then it will
       * report the error and continue processing.
@@ -562,7 +562,7 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a Unicode string represting the path
+      * @param systemId A pointer to a Unicode string representing the path
       *                 to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -595,10 +595,10 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a regular native string represting
+      * @param systemId A pointer to a regular native string representing
       *                 the path to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
-      *                 internal consIstency between invocation of 'parseNext'
+      *                 internal consistency between invocation of 'parseNext'
       *                 calls.
       *
       * @return 'true', if successful in parsing the prolog. It indicates the
@@ -720,7 +720,7 @@ public :
       *               points to the schema grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -750,7 +750,7 @@ public :
       *                 preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -777,7 +777,7 @@ public :
       *                 the path to the XML grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -983,7 +983,7 @@ public :
     /**
     * Reset the DocType object on its reuse
     *
-    * <p>This method helps in reseting the DTD object implementational
+    * <p>This method helps in reseting the DTD object implementation
     * defaults each time the DTD is begun.</p>
     *
     */
@@ -1049,7 +1049,7 @@ public :
     * startElement() event for every endElement() event (even when the
     * element is empty).</p>
     *
-    * @param uri The URI of the asscioated namespace for this element
+    * @param uri The URI of the associated namespace for this element
 	* @param localname The local part of the element name
 	* @param qname The QName of this element
     * @exception SAXException Any SAX exception, possibly
@@ -1170,7 +1170,7 @@ public :
     * contain only attributes with explicit values (specified or
     * defaulted): #IMPLIED attributes will be omitted.</p>
     *
-    * @param uri The URI of the asscioated namespace for this element
+    * @param uri The URI of the associated namespace for this element
 	* @param localname The local part of the element name
 	* @param qname The QName of this element
     * @param attrs The attributes attached to the element, if any.
@@ -1323,7 +1323,7 @@ public :
     * Reset the Error handler object on its reuse
     *
     * <p>This method helps in reseting the Error handler object
-    * implementational defaults each time the Error handler is begun.</p>
+    * implementation defaults each time the Error handler is begun.</p>
     *
     */
     virtual void resetErrors();
diff --git a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
index 87f5e0b5df00c6af862ea6da5bd908b1ce1167e2..dcac0b7729f3cbce017d230c4f06d1fd441bdb85 100644
--- a/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
+++ b/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
@@ -147,7 +147,7 @@ public :
      * The parser owns the returned pointer.  The memory allocated for
      * the returned pointer will be destroyed when the parser is deleted.
      *
-     * To ensure assessiblity of the returned information after the parser
+     * To ensure accessibility of the returned information after the parser
      * is deleted, callers need to copy and store the returned information
      * somewhere else; otherwise you may get unexpected result.  Since the returned
      * pointer is a generic void pointer, see the SAX2 Programming Guide to learn
@@ -587,7 +587,7 @@ public :
 
     /**
       * This method allows users to set the parser's behaviour when it
-      * encounters a validtion constraint error. If set to true, and the
+      * encounters a validation constraint error. If set to true, and the
       * the parser will treat validation error as fatal and will exit depends on the
       * state of "getExitOnFirstFatalError". If false, then it will
       * report the error and continue processing.
@@ -633,7 +633,7 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a Unicode string represting the path
+      * @param systemId A pointer to a Unicode string representing the path
       *                 to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -666,10 +666,10 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a regular native string represting
+      * @param systemId A pointer to a regular native string representing
       *                 the path to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
-      *                 internal consIstency between invocation of 'parseNext'
+      *                 internal consistency between invocation of 'parseNext'
       *                 calls.
       *
       * @return 'true', if successful in parsing the prolog. It indicates the
@@ -789,7 +789,7 @@ public :
       *               points to the schema grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -817,7 +817,7 @@ public :
       *                 preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -842,7 +842,7 @@ public :
       *                 the path to the XML grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -1020,7 +1020,7 @@ public :
       * was just scanned.
       *
       * <p>If any advanced callback handlers are installed, the
-      * corresponding 'endEnityReference' method is invoked.</p>
+      * corresponding 'endEntityReference' method is invoked.</p>
       *
       * @param entDecl A const reference to the object containing the
       *                entity declaration information.
@@ -1115,7 +1115,7 @@ public :
       * This method is used to indicate the start of an entity reference.
       *
       * <p>If any advanced callback handlers are installed, the
-      * corresponding 'endEnityReference' method is invoked.</p>
+      * corresponding 'endEntityReference' method is invoked.</p>
       *
       * @param entDecl A const reference to the object containing the
       *                entity declaration information.
@@ -1226,7 +1226,7 @@ public :
 
     /**
       * This method allows an installed XMLEntityHandler to further
-      * process any system id's of enternal entities encountered in
+      * process any system id's of external entities encountered in
       * the XML file being parsed, such as redirection etc.
       *
       * <b><font color="#FF0000">This method always returns 'false'
diff --git a/src/xercesc/parsers/SAXParser.hpp b/src/xercesc/parsers/SAXParser.hpp
index cfb8345dfcfd9de3be19ad2ae3d4357badf78457..5590f2070672cd75f3a291d1728ee34b97d7d1d5 100644
--- a/src/xercesc/parsers/SAXParser.hpp
+++ b/src/xercesc/parsers/SAXParser.hpp
@@ -106,7 +106,7 @@ public :
       *                   parser is responsible for freeing the memory.
       * @param manager    Pointer to the memory manager to be used to
       *                   allocate objects.
-      * @param gramPool   The collection of cached grammers.
+      * @param gramPool   The collection of cached grammars.
       */
     SAXParser
     (
@@ -306,7 +306,7 @@ public :
       */
     bool getValidationConstraintFatal() const;
 
-   /** Get the set of Namespace/SchemaLocation that is specified externaly.
+   /** Get the set of Namespace/SchemaLocation that is specified externally.
       *
       * This method returns the list of Namespace/SchemaLocation that was
       * specified using setExternalSchemaLocation.
@@ -314,7 +314,7 @@ public :
       * The parser owns the returned string, and the memory allocated for
       * the returned string will be destroyed when the parser is deleted.
       *
-      * To ensure assessiblity of the returned information after the parser
+      * To ensure accessibility of the returned information after the parser
       * is deleted, callers need to copy and store the returned information
       * somewhere else.
       *
@@ -327,7 +327,7 @@ public :
       */
     XMLCh* getExternalSchemaLocation() const;
 
-   /** Get the noNamespace SchemaLocation that is specified externaly.
+   /** Get the noNamespace SchemaLocation that is specified externally.
       *
       * This method returns the no target namespace XML Schema Location
       * that was specified using setExternalNoNamespaceSchemaLocation.
@@ -335,7 +335,7 @@ public :
       * The parser owns the returned string, and the memory allocated for
       * the returned string will be destroyed when the parser is deleted.
       *
-      * To ensure assessiblity of the returned information after the parser
+      * To ensure accessibility of the returned information after the parser
       * is deleted, callers need to copy and store the returned information
       * somewhere else.
       *
@@ -639,7 +639,7 @@ public :
       *
       * Full schema constraint checking includes those checking that may
       * be time-consuming or memory intensive. Currently, particle unique
-      * attribution constraint checking and particle derivation resriction checking
+      * attribution constraint checking and particle derivation restriction checking
       * are controlled by this option.
       *
       * The parser's default state is: false.
@@ -682,7 +682,7 @@ public :
 
     /**
       * This method allows users to set the parser's behaviour when it
-      * encounters a validtion constraint error. If set to true, and the
+      * encounters a validation constraint error. If set to true, and the
       * the parser will treat validation error as fatal and will exit depends on the
       * state of "getExitOnFirstFatalError". If false, then it will
       * report the error and continue processing.
@@ -704,7 +704,7 @@ 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 targetNamespace of a schema occurring in the instance document in
       * 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
@@ -1041,7 +1041,7 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a Unicode string represting the path
+      * @param systemId A pointer to a Unicode string representing the path
       *                 to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -1074,10 +1074,10 @@ public :
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a regular native string represting
+      * @param systemId A pointer to a regular native string representing
       *                 the path to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
-      *                 internal consIstency between invocation of 'parseNext'
+      *                 internal consistency between invocation of 'parseNext'
       *                 calls.
       *
       * @return 'true', if successful in parsing the prolog. It indicates the
@@ -1199,7 +1199,7 @@ public :
       *               points to the schema grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -1229,7 +1229,7 @@ public :
       *                 preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -1256,7 +1256,7 @@ public :
       *                 the path to the XML grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -1511,7 +1511,7 @@ public :
       * was just scanned.
       *
       * <p>If any advanced callback handlers are installed, the
-      * corresponding 'endEnityReference' method is invoked.</p>
+      * corresponding 'endEntityReference' method is invoked.</p>
       *
       * @param entDecl A const reference to the object containing the
       *                entity declaration information.
@@ -1606,7 +1606,7 @@ public :
       * This method is used to indicate the start of an entity reference.
       *
       * <p>If any advanced callback handlers are installed, the
-      * corresponding 'endEnityReference' method is invoked.</p>
+      * corresponding 'endEntityReference' method is invoked.</p>
       *
       * @param entDecl A const reference to the object containing the
       *                entity declaration information.
@@ -1717,7 +1717,7 @@ public :
 
     /**
       * This method allows an installed XMLEntityHandler to further
-      * process any system id's of enternal entities encountered in
+      * process any system id's of external entities encountered in
       * the XML file being parsed, such as redirection etc.
       *
       * <b>This method always returns 'false'
diff --git a/src/xercesc/parsers/XercesDOMParser.hpp b/src/xercesc/parsers/XercesDOMParser.hpp
index 827c7f967ede48888d631e58e8c140ea76768e3a..f257d2e76f1e0f07f1d2a942a51fa1c3fc191a58 100644
--- a/src/xercesc/parsers/XercesDOMParser.hpp
+++ b/src/xercesc/parsers/XercesDOMParser.hpp
@@ -38,7 +38,7 @@ class XMLResourceIdentifier;
   * This class implements the Document Object Model (DOM) interface.
   * It should be used by applications which choose to parse and
   * process the XML document using the DOM api's. This implementation
-  * also allows the applications to install an error and an entitty
+  * also allows the applications to install an error and an entity
   * handler (useful extensions to the DOM specification).
   *
   * <p>It can be used to instantiate a validating or non-validating
@@ -48,7 +48,7 @@ class PARSERS_EXPORT XercesDOMParser : public AbstractDOMParser
 {
 public :
     // -----------------------------------------------------------------------
-    //  Constructors and Detructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
 
     /** @name Constructors and Destructor */
@@ -298,7 +298,7 @@ public :
       * instead of building the grammar from scratch, to validate XML
       * documents.
       *
-      * If the 'Grammar caching' flag is set to true, this mehod ignore the
+      * If the 'Grammar caching' flag is set to true, this method ignore the
       * value passed in.
       *
       * The parser's default state is: false.
@@ -441,7 +441,7 @@ public :
     /** Expand a system id
       *
       * This method allows an installed XMLEntityHandler to further
-      * process any system id's of enternal entities encountered in
+      * process any system id's of external entities encountered in
       * the XML file being parsed, such as redirection etc.
       *
       * <b>This method always returns 'false'
@@ -526,7 +526,7 @@ public :
       *               points to the schema grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -556,7 +556,7 @@ public :
       *                 preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -583,7 +583,7 @@ public :
       *                 the path to the XML grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
diff --git a/src/xercesc/sax/AttributeList.hpp b/src/xercesc/sax/AttributeList.hpp
index 0f625cac674d27b96682461d1536738898e2d14c..34ccc819ecfcf04b79deda30112aa128e4d76f2a 100644
--- a/src/xercesc/sax/AttributeList.hpp
+++ b/src/xercesc/sax/AttributeList.hpp
@@ -137,7 +137,7 @@ public:
     *
     * If the parser has not read a declaration for the attribute,
     * or if the parser does not report attribute types, then it must
-    * return the value "CDATA" as stated in the XML 1.0 Recommentation
+    * return the value "CDATA" as stated in the XML 1.0 Recommendation
     * (clause 3.3.3, "Attribute-Value Normalization").
     *
     * For an enumerated attribute that is not a notation, the
diff --git a/src/xercesc/sax/DTDHandler.hpp b/src/xercesc/sax/DTDHandler.hpp
index 0496c5014b9e484307e209b67becb48bbb1bc802..70eb79ac96bf043d7a35405d1d5231f2c52ddd41 100644
--- a/src/xercesc/sax/DTDHandler.hpp
+++ b/src/xercesc/sax/DTDHandler.hpp
@@ -135,7 +135,7 @@ public:
     /**
     * Reset the DocType object on its reuse
     *
-    * <p>This method helps in reseting the DTD object implementational
+    * <p>This method helps in reseting the DTD object implementation
     * defaults each time the DTD is begun.</p>
     *
     */
diff --git a/src/xercesc/sax/DocumentHandler.hpp b/src/xercesc/sax/DocumentHandler.hpp
index e70c996edc5fa0b61a6cca55a126895cc0c2ef03..6aecddb64b73b4ed1d3ec8e738fc2c120dd9f82b 100644
--- a/src/xercesc/sax/DocumentHandler.hpp
+++ b/src/xercesc/sax/DocumentHandler.hpp
@@ -190,9 +190,9 @@ public:
     ) = 0;
 
     /**
-    * Reset the Docuemnt object on its reuse
+    * Reset the Document object on its reuse
     *
-    * <p>This method helps in reseting the document implementational
+    * <p>This method helps in reseting the document implementation
     * defaults each time the document is begun.</p>
     *
     */
diff --git a/src/xercesc/sax/ErrorHandler.hpp b/src/xercesc/sax/ErrorHandler.hpp
index 88ce4e6771a4aba4a93f25805519cc1fa30eeda5..eb517fc6e822e1d83f8e28ee9be2cff61bbd2056 100644
--- a/src/xercesc/sax/ErrorHandler.hpp
+++ b/src/xercesc/sax/ErrorHandler.hpp
@@ -67,7 +67,7 @@ public:
     {
     }
 
-    /** Desctructor */
+    /** Destructor */
     virtual ~ErrorHandler()
     {
     }
@@ -144,7 +144,7 @@ public:
     * Reset the Error handler object on its reuse
     *
     * <p>This method helps in reseting the Error handler object
-    * implementational defaults each time the Error handler is begun.</p>
+    * implementation defaults each time the Error handler is begun.</p>
     *
     */
     virtual void resetErrors() = 0;
diff --git a/src/xercesc/sax/HandlerBase.hpp b/src/xercesc/sax/HandlerBase.hpp
index 17c4f2b34afc5e80e7326d34020b0493405424ec..12a5cbe2aed653a5abfb1e577c4af4570ac5d064 100644
--- a/src/xercesc/sax/HandlerBase.hpp
+++ b/src/xercesc/sax/HandlerBase.hpp
@@ -154,7 +154,7 @@ public:
     );
 
     /**
-    * Reset the Docuemnt object on its reuse
+    * Reset the Document object on its reuse
     *
     * @see DocumentHandler#resetDocument
     */
@@ -225,7 +225,7 @@ public:
     * in a subclass to do special translations such as catalog lookups
     * or URI redirection.</p>
     *
-    * @param publicId The public identifer, or null if none is
+    * @param publicId The public identifier, or null if none is
     *                 available.
     * @param systemId The system identifier provided in the XML
     *                 document.
diff --git a/src/xercesc/sax/InputSource.hpp b/src/xercesc/sax/InputSource.hpp
index 903eac314d1987675e9d258799aa67b47afc4c0e..58334b7a17138589031954615ca6a0c7ff57a7a0 100644
--- a/src/xercesc/sax/InputSource.hpp
+++ b/src/xercesc/sax/InputSource.hpp
@@ -98,7 +98,7 @@ public:
     //@{
   /**
     * An input source can be set to force the parser to assume a particular
-    * encoding for the data that input source reprsents, via the setEncoding()
+    * encoding for the data that input source represents, via the setEncoding()
     * method. This method returns name of the encoding that is to be forced.
     * If the encoding has never been forced, it returns a null pointer.
     *
diff --git a/src/xercesc/sax/SAXParseException.hpp b/src/xercesc/sax/SAXParseException.hpp
index 6e2b63cd82be4dfcdb1d73d74acc1192f3d3d59d..a9df4493c1810687ac734eaf7dcbb3113c3e0645 100644
--- a/src/xercesc/sax/SAXParseException.hpp
+++ b/src/xercesc/sax/SAXParseException.hpp
@@ -77,9 +77,9 @@ public:
     * fully before creating the exception.</p>
     *
     * @param message The error or warning message.
-    * @param publicId The public identifer of the entity that generated
+    * @param publicId The public identifier of the entity that generated
     *                 the error or warning.
-    * @param systemId The system identifer of the entity that generated
+    * @param systemId The system identifier of the entity that generated
     *                 the error or warning.
     * @param lineNumber The line number of the end of the text that
     *                   caused the error or warning.
diff --git a/src/xercesc/sax2/Attributes.hpp b/src/xercesc/sax2/Attributes.hpp
index 1d36f7cfabefb7731f05405167094b6c439a9e86..2c482a2d19cf7ab82d076f67dbe5b184ea4910dc 100644
--- a/src/xercesc/sax2/Attributes.hpp
+++ b/src/xercesc/sax2/Attributes.hpp
@@ -166,7 +166,7 @@ public:
     *
     * If the parser has not read a declaration for the attribute,
     * or if the parser does not report attribute types, then it must
-    * return the value "CDATA" as stated in the XML 1.0 Recommentation
+    * return the value "CDATA" as stated in the XML 1.0 Recommendation
     * (clause 3.3.3, "Attribute-Value Normalization").
     *
     * For an enumerated attribute that is not a notation, the
diff --git a/src/xercesc/sax2/ContentHandler.hpp b/src/xercesc/sax2/ContentHandler.hpp
index 1aeda18b5a9688d2a75d5cb7d9088f758b7d9545..4224fd54f962fad4af92441171da3bab273235f1 100644
--- a/src/xercesc/sax2/ContentHandler.hpp
+++ b/src/xercesc/sax2/ContentHandler.hpp
@@ -128,7 +128,7 @@ public:
     * startElement() event for every endElement() event (even when the
     * element is empty).</p>
     *
-    * @param uri The URI of the asscioated namespace for this element
+    * @param uri The URI of the associated namespace for this element
 	* @param localname The local part of the element name
 	* @param qname The QName of this element
     * @exception SAXException Any SAX exception, possibly
diff --git a/src/xercesc/sax2/DeclHandler.hpp b/src/xercesc/sax2/DeclHandler.hpp
index 7cf85a04c9019c175eee3e7b0c53404b395fd597..5ed01059f4c505c3870fcb10da23560406f179b3 100644
--- a/src/xercesc/sax2/DeclHandler.hpp
+++ b/src/xercesc/sax2/DeclHandler.hpp
@@ -89,7 +89,7 @@ public:
    /**
     * Report an attribute type declaration.
     *
-    * <p>The Parser will call this method to report each occurence of
+    * <p>The Parser will call this method to report each occurrence of
     * a comment in the XML document.</p>
     *
     * <p>The application must not attempt to read from the array
diff --git a/src/xercesc/sax2/DefaultHandler.hpp b/src/xercesc/sax2/DefaultHandler.hpp
index cd47560005a5db41ac05295a2810b7a9b20665a2..528d44eeab42bc11ee927c8b974cf2f8f3a9c00f 100644
--- a/src/xercesc/sax2/DefaultHandler.hpp
+++ b/src/xercesc/sax2/DefaultHandler.hpp
@@ -112,7 +112,7 @@ public:
     * each element (such as finalising a tree node or writing
     * output to a file).</p>
     *
-    * @param uri The URI of the asscioated namespace for this element
+    * @param uri The URI of the associated namespace for this element
 	* @param localname The local part of the element name
 	* @param qname The QName of this element
     * @exception SAXException Any SAX exception, possibly
@@ -169,7 +169,7 @@ public:
     );
 
     /**
-    * Reset the Docuemnt object on its reuse
+    * Reset the Document object on its reuse
     *
     * @see DocumentHandler#resetDocument
     */
@@ -214,7 +214,7 @@ public:
     * each element (such as allocating a new tree node or writing
     * output to a file).</p>
     *
-    * @param uri The URI of the asscioated namespace for this element
+    * @param uri The URI of the associated namespace for this element
 	* @param localname the local part of the element name
 	* @param qname the QName of this element
     * @param attrs The specified or defaulted attributes.
@@ -302,7 +302,7 @@ public:
     * in a subclass to do special translations such as catalog lookups
     * or URI redirection.</p>
     *
-    * @param publicId The public identifer, or null if none is
+    * @param publicId The public identifier, or null if none is
     *                 available.
     * @param systemId The system identifier provided in the XML
     *                 document.
@@ -445,7 +445,7 @@ public:
    /**
     * Receive notification of comments.
     *
-    * <p>The Parser will call this method to report each occurence of
+    * <p>The Parser will call this method to report each occurrence of
     * a comment in the XML document.</p>
     *
     * <p>The application must not attempt to read from the array
diff --git a/src/xercesc/sax2/LexicalHandler.hpp b/src/xercesc/sax2/LexicalHandler.hpp
index a75eac2f26fd964c9a710fd079c11e9ca413b0ce..e6ac3e477633442d17c3654fd28e9e3687e17ddd 100644
--- a/src/xercesc/sax2/LexicalHandler.hpp
+++ b/src/xercesc/sax2/LexicalHandler.hpp
@@ -65,7 +65,7 @@ public:
    /**
     * Receive notification of comments.
     *
-    * <p>The Parser will call this method to report each occurence of
+    * <p>The Parser will call this method to report each occurrence of
     * a comment in the XML document.</p>
     *
     * <p>The application must not attempt to read from the array
diff --git a/src/xercesc/sax2/SAX2XMLReader.hpp b/src/xercesc/sax2/SAX2XMLReader.hpp
index b2462f0925e3787adfdb3e948660eaa5c8486320..09e0982121ddf9b7a7822234af4c63a39782d805 100644
--- a/src/xercesc/sax2/SAX2XMLReader.hpp
+++ b/src/xercesc/sax2/SAX2XMLReader.hpp
@@ -140,7 +140,7 @@ public:
      * The parser owns the returned pointer.  The memory allocated for
      * the returned pointer will be destroyed when the parser is deleted.
      *
-     * To ensure assessiblity of the returned information after the parser
+     * To ensure accessibility of the returned information after the parser
      * is deleted, callers need to copy and store the returned information
      * somewhere else; otherwise you may get unexpected result.  Since the returned
      * pointer is a generic void pointer, see the SAX2 Programming Guide to learn
@@ -547,7 +547,7 @@ public:
 
     /**
       * This method allows users to set the parser's behaviour when it
-      * encounters a validtion constraint error. If set to true, and the
+      * encounters a validation constraint error. If set to true, and the
       * the parser will treat validation error as fatal and will exit depends on the
       * state of "getExitOnFirstFatalError". If false, then it will
       * report the error and continue processing.
@@ -593,7 +593,7 @@ public:
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a Unicode string represting the path
+      * @param systemId A pointer to a Unicode string representing the path
       *                 to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
       *                 internal consistency between invocation of 'parseNext'
@@ -626,10 +626,10 @@ public:
       * the scan of the prolog failed and the token is not going to work on
       * subsequent scanNext() calls.
       *
-      * @param systemId A pointer to a regular native string represting
+      * @param systemId A pointer to a regular native string representing
       *                 the path to the XML file to be parsed.
       * @param toFill   A token maintaing state information to maintain
-      *                 internal consIstency between invocation of 'parseNext'
+      *                 internal consistency between invocation of 'parseNext'
       *                 calls.
       *
       * @return 'true', if successful in parsing the prolog. It indicates the
@@ -751,7 +751,7 @@ public:
       *               points to the schema grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -781,7 +781,7 @@ public:
       *                 preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
@@ -808,7 +808,7 @@ public:
       *                 the path to the XML grammar file to be preparsed.
       * @param grammarType The grammar type (Schema or DTD).
       * @param toCache If <code>true</code>, we cache the preparsed grammar,
-      *                otherwise, no chaching. Default is <code>false</code>.
+      *                otherwise, no caching. Default is <code>false</code>.
       * @return The preparsed schema grammar object (SchemaGrammar or
       *         DTDGrammar). That grammar object is owned by the parser.
       *
diff --git a/src/xercesc/sax2/XMLReaderFactory.hpp b/src/xercesc/sax2/XMLReaderFactory.hpp
index 18b495e02487577aeb73f7e187f66d61e59bfc4b..a63bcacee06646c93027b88da5c306f38a9fb2da 100644
--- a/src/xercesc/sax2/XMLReaderFactory.hpp
+++ b/src/xercesc/sax2/XMLReaderFactory.hpp
@@ -34,7 +34,7 @@ class XMLGrammarPool;
   * Creates a SAX2 parser (SAX2XMLReader).
   *
   * <p>Note: The parser object returned by XMLReaderFactory is owned by the
-  * calling users, and it's the responsiblity of the users to delete that
+  * calling users, and it's the responsibility of the users to delete that
   * parser object, once they no longer need it.</p>
   *
   * @see SAX2XMLReader#SAX2XMLReader
diff --git a/src/xercesc/util/Base64.hpp b/src/xercesc/util/Base64.hpp
index 04f6b177978ae9b5881c4a5ae25c4ca353e20d07..4104de7242307962086742aea4545f1d41c56c53 100644
--- a/src/xercesc/util/Base64.hpp
+++ b/src/xercesc/util/Base64.hpp
@@ -143,7 +143,7 @@ public :
      /**
      * get canonical representation
      *
-     * Caller is responsible for the proper deallcation
+     * Caller is responsible for the proper deallocation
      * of the string returned.
      *
      * @param inputData A string containing the Base64
@@ -206,7 +206,7 @@ private :
     //     Table used in decoding base64.
     //
     //  isInitialized
-    //     Set once base64Inverse is initalized.
+    //     Set once base64Inverse is initialized.
     //
     //  quadsPerLine
     //     Number of quadruplets per one line. The encoded output
diff --git a/src/xercesc/util/HexBin.hpp b/src/xercesc/util/HexBin.hpp
index 80129260681ddf9af800cd9daae148244eb86198..0b3df788f208a69c7cc37c5731f87019d5b9c809 100644
--- a/src/xercesc/util/HexBin.hpp
+++ b/src/xercesc/util/HexBin.hpp
@@ -56,7 +56,7 @@ public :
      /**
      * get canonical representation
      *
-     * Caller is responsible for the proper deallcation
+     * Caller is responsible for the proper deallocation
      * of the string returned.
      *
      * @param hexData A string containing the HexBinary
@@ -99,7 +99,7 @@ private :
     //  Helper methods
     // -----------------------------------------------------------------------
 
-    static bool isHex(const XMLCh& octect);
+    static bool isHex(const XMLCh& octet);
 
     // -----------------------------------------------------------------------
     //  Unimplemented constructors and operators
@@ -113,7 +113,7 @@ private :
     //
     //  isInitialized
     //
-    //     set once hexNumberTable is initalized.
+    //     set once hexNumberTable is initialized.
     //
     //  hexNumberTable
     //
diff --git a/src/xercesc/util/LogicalPath.c b/src/xercesc/util/LogicalPath.c
index e2581447dfef5ef315365460892fe7337d80568e..97782abf43936eb08c72e3d7cb93bc1d361d6414 100644
--- a/src/xercesc/util/LogicalPath.c
+++ b/src/xercesc/util/LogicalPath.c
@@ -98,8 +98,8 @@ XMLCh* XMLPlatformUtils::weavePaths(const XMLCh* const    basePath
 
     //
     // 1. concatenate the base and relative
-    // 2. remove all occurences of "/./"
-    // 3. remove all occurences of segment/../ where segment is not ../
+    // 2. remove all occurrences of "/./"
+    // 3. remove all occurrences of segment/../ where segment is not ../
 	// 
 
     XMLString::subString(tmpBuf, basePath, 0, (basePtr - basePath + 1), manager);
@@ -115,7 +115,7 @@ XMLCh* XMLPlatformUtils::weavePaths(const XMLCh* const    basePath
 }
 
 //
-// Remove all occurences of './' when it is part of '/./'
+// Remove all occurrences of './' when it is part of '/./'
 //
 // Since it could be '.\' or other combination on windows ( eg, '.'+chYanSign)
 // we can't make use of patterMatch().
@@ -170,7 +170,7 @@ void XMLPlatformUtils::removeDotSlash(XMLCh* const path
 }
 
 //
-// Remove all occurences of '/segment/../' when segment is not '..'
+// Remove all occurrences of '/segment/../' when segment is not '..'
 //
 // Cases with extra /../ is left to the underlying file system.
 //
diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
index 4f1c792b1388bd82dc0677e1cbb7c42b0d53677c..c945a4b307a38ee9a6cb13613fdff06087cafb67 100644
--- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
+++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp
@@ -90,7 +90,7 @@ private :
     //
     //  fLocaleBundle
     //      pointer to the required locale specific resource bundle,
-	//           or to the default locale resrouce bundle in case the required
+	//           or to the default locale resource bundle in case the required
 	//              locale specific resource bundle unavailable.
     //
     //  fDomainBundle
diff --git a/src/xercesc/util/Mutexes.hpp b/src/xercesc/util/Mutexes.hpp
index 363e232a9926009aefcedbef357eda24978440a3..50d981753fe2eaa51f80e415d23a503f2b3b93e4 100644
--- a/src/xercesc/util/Mutexes.hpp
+++ b/src/xercesc/util/Mutexes.hpp
@@ -68,7 +68,7 @@ private :
 
 
     // -----------------------------------------------------------------------
-    //  Sun PlatformUtils needs acess to fHandle to initialize the
+    //  Sun PlatformUtils needs access to fHandle to initialize the
     //  atomicOpsMutex at startup.
     // -----------------------------------------------------------------------
     friend class XMLPlatformUtils;
diff --git a/src/xercesc/util/NameIdPool.hpp b/src/xercesc/util/NameIdPool.hpp
index bb62e8c82cc239d514e89094cba0199c556a3776..542b832e69b75b30cb42436894b7fa5600e25aa4 100644
--- a/src/xercesc/util/NameIdPool.hpp
+++ b/src/xercesc/util/NameIdPool.hpp
@@ -53,7 +53,7 @@ template <class TElem> class NameIdPoolEnumerator;
 //  whole thing is flushed. This makes it very easy to maintain the two
 //  access methods in sync.
 //
-//  For efficiency reasons, the id refererence array is never flushed until
+//  For efficiency reasons, the id reference array is never flushed until
 //  the dtor. This way, it does not have to be regrown every time its reused.
 //
 //  All elements are assumed to be owned by the pool!
@@ -63,7 +63,7 @@ template <class TElem> class NameIdPool : public XMemory
 {
 public :
     // -----------------------------------------------------------------------
-    //  Contructors and Destructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
     NameIdPool
     (
diff --git a/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp b/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp
index e87385428404381c29356c7eaa49986cbf3129b8..463d9a061873b0db42baac214807a1d0a7af0496 100644
--- a/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp
+++ b/src/xercesc/util/NetAccessors/BinHTTPInputStreamCommon.hpp
@@ -80,7 +80,7 @@ public:
             for(; *(chars+count); ++count) ;
 
             if(fIndex + count >= fCapacity) {
-                insureCapacity(count);
+                ensureCapacity(count);
             }
             memcpy(&fBuffer[fIndex], chars, count * sizeof(char));
             fIndex += count;
@@ -91,7 +91,7 @@ public:
     {
         if(chars != 0 && len != 0) {
             if(fIndex + len >= fCapacity) {
-                insureCapacity(len);
+                ensureCapacity(len);
             }
             memcpy(&fBuffer[fIndex], chars, len * sizeof(char));
             fIndex += len;
@@ -106,7 +106,7 @@ public:
 	}
 
         if(fIndex + 1 >= fCapacity)
-            insureCapacity(1);
+            ensureCapacity(1);
 
         fBuffer[fIndex] = '0' + n;
         ++fIndex;
@@ -125,7 +125,7 @@ private:
     CharBuffer(const CharBuffer &);
     CharBuffer &operator=(const CharBuffer &);
 
-    void insureCapacity(XMLSize_t extraNeeded)
+    void ensureCapacity(XMLSize_t extraNeeded)
     {
         // If we can't handle it, try doubling the buffer size.
         XMLSize_t newCap = (fIndex + extraNeeded) * 2;
diff --git a/src/xercesc/util/PlatformUtils.hpp b/src/xercesc/util/PlatformUtils.hpp
index 621e81bf4f1a794b5df51356b3dc700010775eb6..9f031f56e56cc84bdd62d9ce05bec9075a9ff0b7 100644
--- a/src/xercesc/util/PlatformUtils.hpp
+++ b/src/xercesc/util/PlatformUtils.hpp
@@ -62,7 +62,7 @@ private :
   *
   * This class contains methods that must be implemented in a platform
   * specific manner. The actual implementations of these methods are
-  * available in the per-platform files indide <code>src/util/Platforms
+  * available in the per-platform files inside <code>src/util/Platforms
   * </code>.
   */
 class XMLUTIL_EXPORT XMLPlatformUtils
@@ -89,11 +89,11 @@ public :
     /** The transcoding service.
       *
       * This is provided by the per platform driver, so each platform can
-      * choose what implemenation it wants to use. When the platform
+      * choose what implementation it wants to use. When the platform
       * independent initialization code needs to get a transcoding service
       * object, it will call <code>makeTransService()</code> to ask the
       * per-platform code to create one. Only one transcoding service
-      * object is reqeusted per-process, so it is shared and synchronized
+      * object is requested per-process, so it is shared and synchronized
       * among parser instances within that process.
       */
     static XMLTransService*     fgTransService;
@@ -251,7 +251,7 @@ public :
       * in the absence of it, the default panic handler.
       *
       * In case the default panic handler does not support a particular
-      * platform, the platform specific panic hanlding shall be implemented
+      * platform, the platform specific panic handling shall be implemented
       * here </p>.
       *
       * @param reason The enumeration that defines the cause of the failure
@@ -275,7 +275,7 @@ public :
     /** Get the current file position
       *
       * This must be implemented by the per-platform driver, which should
-      * use local file services to deterine the current position within
+      * use local file services to determine the current position within
       * the passed file.
       *
       * Since the file API provided here only reads, if the host platform
@@ -486,7 +486,7 @@ public :
         MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
     );
 
-    /** Check if a charater is a slash
+    /** Check if a character is a slash
       *
       * This must be implemented by the per-platform driver.
       *
@@ -497,7 +497,7 @@ public :
       */
     static inline bool isAnySlash(XMLCh c);
 
-    /** Remove occurences of the pair of dot slash
+    /** Remove occurrences of the pair of dot slash
       *
       * To remove the sequence, dot slash if it is part of the sequence,
       * slash dot slash.
@@ -509,7 +509,7 @@ public :
     static void   removeDotSlash(XMLCh* const srcPath
         , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
 
-    /** Remove occurences of the dot dot slash
+    /** Remove occurrences of the dot dot slash
       *
       * To remove the sequence, slash dot dot slash and its preceding path segment
       * if and only if the preceding path segment is not slash dot dot slash.
@@ -574,7 +574,7 @@ public :
       * This must be implemented by the per-platform driver, which should
       * use local services to return the current value of a running
       * millisecond timer. Note that the value returned is only as accurate
-      * as the millisecond time of the underyling host system.
+      * as the millisecond time of the underlying host system.
       *
       * @return Returns the system time as an unsigned long
       */
@@ -733,7 +733,7 @@ private :
       */
     static XMLNetAccessor* makeNetAccessor();
 
-    /** Creates a Transoding service
+    /** Creates a Transcoding service
       *
       * Each per-platform driver must implement this method and return some
       * derivative of the XMLTransService class. This object serves as the
@@ -749,7 +749,7 @@ private :
       *
       * @param srcPath the path to search
       *
-      * @return   the position of the first occurence of slash dot dot slash
+      * @return   the position of the first occurrence of slash dot dot slash
       *            -1 if no such sequence is found
       */
     static int  searchSlashDotDotSlash(XMLCh* const srcPath);
diff --git a/src/xercesc/util/QName.hpp b/src/xercesc/util/QName.hpp
index 2b3468fe5c50897eb3f9a6e3afb5b912a9619eac..a950d0d84bad6fff5c886cd34827bc19ec80ca32 100644
--- a/src/xercesc/util/QName.hpp
+++ b/src/xercesc/util/QName.hpp
@@ -35,7 +35,7 @@ class XMLUTIL_EXPORT QName : public XSerializable, public XMemory
 {
 public :
     // -----------------------------------------------------------------------
-    //  Contructors and Destructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
     /** Default constructor. */
     QName(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
@@ -134,7 +134,7 @@ private :
     //      The prefix that was applied to this attribute's name, and the
     //      current size of the buffer (minus one for the null.) Prefixes
     //      really don't matter technically but it might be required for
-    //      pratical reasons, to recreate the original document for instance.
+    //      practical reasons, to recreate the original document for instance.
     //
     //  fLocalPart
     //  fLocalPartBufSz
@@ -146,7 +146,7 @@ private :
     //      This is the QName form of the name, which is faulted in (from the
     //      prefix and name) upon request. The size field indicates the
     //      current size of the buffer (minus one for the null.) It will be
-    //      zero until fauled in.
+    //      zero until filled in.
     //
     //  fURIId
     //      The id of the URI that this attribute belongs to.
diff --git a/src/xercesc/util/RefArrayOf.c b/src/xercesc/util/RefArrayOf.c
index b2e9be9ccb7d19a2d5e48685c10d54ac2651395e..6e22db3742e17430cb466025dddf179b030dc5f6 100644
--- a/src/xercesc/util/RefArrayOf.c
+++ b/src/xercesc/util/RefArrayOf.c
@@ -30,7 +30,7 @@
 XERCES_CPP_NAMESPACE_BEGIN
 
 // ---------------------------------------------------------------------------
-//  RefArrayOf: Contructors and Destructor
+//  RefArrayOf: Constructors and Destructor
 // ---------------------------------------------------------------------------
 template <class TElem>
 RefArrayOf<TElem>::RefArrayOf(const XMLSize_t size,
@@ -218,7 +218,7 @@ template <class TElem> void RefArrayOf<TElem>::resize(const XMLSize_t newSize)
     for (; index < newSize; index++)
         newArray[index] = 0;
 
-    // Delete the old array and udpate our members
+    // Delete the old array and update our members
     fMemoryManager->deallocate(fArray);//delete [] fArray;
     fArray = newArray;
     fSize = newSize;
diff --git a/src/xercesc/util/RefArrayOf.hpp b/src/xercesc/util/RefArrayOf.hpp
index 9a9861f143814850ef295720020de263a234b96a..1bd949a2551f987b8117dba7dc8792e518dbb8c2 100644
--- a/src/xercesc/util/RefArrayOf.hpp
+++ b/src/xercesc/util/RefArrayOf.hpp
@@ -34,7 +34,7 @@ template <class TElem> class RefArrayOf : public XMemory
 {
 public :
     // -----------------------------------------------------------------------
-    //  Contructors and Destructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
     RefArrayOf
     (
diff --git a/src/xercesc/util/StringPool.hpp b/src/xercesc/util/StringPool.hpp
index d6185b2bec4e6f63808b48a1d4515f0bcaa2e3ea..6dfbfabbb7a4f11a78799f592bc8475fdf766403 100644
--- a/src/xercesc/util/StringPool.hpp
+++ b/src/xercesc/util/StringPool.hpp
@@ -29,7 +29,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 
 //
 //  This class implements a string pool, in which strings can be added and
-//  given a unique id by which they can be refered. It has to provide fast
+//  given a unique id by which they can be referred. It has to provide fast
 //  access both mapping from a string to its id and mapping from an id to
 //  its string. This requires that it provide two separate data structures.
 //  The map one is a hash table for quick storage and look up by name. The
@@ -126,7 +126,7 @@ protected:
 };
 
 
-// Provid inline versions of some of the simple functions to improve performance.
+// Provide inline versions of some of the simple functions to improve performance.
 inline unsigned int XMLStringPool::addOrFind(const XMLCh* const newString)
 {
     PoolElem* elemToFind = fHashTable->get(newString);
diff --git a/src/xercesc/util/TransENameMap.hpp b/src/xercesc/util/TransENameMap.hpp
index 42666b221d920cb8f6cf7e6481353df33e776403..e896bc9fec85d7924be088008d347007aa8a22a3 100644
--- a/src/xercesc/util/TransENameMap.hpp
+++ b/src/xercesc/util/TransENameMap.hpp
@@ -151,7 +151,7 @@ private :
     //  Private data members
     //
     //  fSwapped
-    //      Indicates whether the endianess of the encoding is opposite of
+    //      Indicates whether the endianness of the encoding is opposite of
     //      that of the local host.
     // -----------------------------------------------------------------------
     bool    fSwapped;
diff --git a/src/xercesc/util/TransService.hpp b/src/xercesc/util/TransService.hpp
index 1bf92d999a8a56d3dff172152353478b0be2bea6..b1f0b288348eb8dbe69cc3df4e585d5ebe4b7fde 100644
--- a/src/xercesc/util/TransService.hpp
+++ b/src/xercesc/util/TransService.hpp
@@ -134,7 +134,7 @@ public :
     virtual void lowerCase(XMLCh* const toLowerCase) = 0;
 
     // -----------------------------------------------------------------------
-    //	Allow users to add their own encodings to the intrinsinc mapping
+    //	Allow users to add their own encodings to the intrinsic mapping
     //	table
     //	Usage:
     //		XMLTransService::addEncoding (
diff --git a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
index 986a458e1f9623901024a7f8325c8269e38d9102..c8f435f57dea6a7d15e9f28d0104aa99494d0488 100644
--- a/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
+++ b/src/xercesc/util/Transcoders/ICU/ICUTransService.hpp
@@ -157,7 +157,7 @@ private :
     //
     //  fSrcOffsets
     //      This is an array of longs, which are allocated to the size of
-    //      the trancoding block (if any) indicated in the ctor. It is used
+    //      the transcoding block (if any) indicated in the ctor. It is used
     //      to get the character offsets from ICU, which are then translated
     //      into an array of char sizes for return.
     // -----------------------------------------------------------------------
diff --git a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
index 427a15c1104706ba27a706509de9574531d766c2..81f0d5bdd00e0761e3f72a92740200d7e462942f 100644
--- a/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
+++ b/src/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp
@@ -55,7 +55,7 @@ public:
     // Convert XMLCh into "native unicode" character
     void	xmlChToMbc (XMLCh xch, char *mbc) const;
 
-    // Fill array of XMLCh characters with data, supplyed in the array
+    // Fill array of XMLCh characters with data, supplied in the array
     // of "native unicode" characters.
     XMLCh*	mbsToXML (
       const char*	mbs_str,
@@ -64,7 +64,7 @@ public:
     ) const;
 
 
-    // Fill array of "native unicode" characters with data, supplyed
+    // Fill array of "native unicode" characters with data, supplied
     // in the array of XMLCh characters.
     char*	xmlToMbs
     (
@@ -90,7 +90,7 @@ protected:
     // Return uppercase equivalent for XMLCh
     XMLCh 	toLower (const XMLCh ch);
 
-    // Wrapper aroung the iconv() for transcoding from the local charset
+    // Wrapper around the iconv() for transcoding from the local charset
     size_t	iconvFrom
     (
       const char	*fromPtr,
@@ -99,7 +99,7 @@ protected:
       size_t		toLen
     );
 
-    // Wrapper aroung the iconv() for transcoding to the local charset
+    // Wrapper around the iconv() for transcoding to the local charset
     size_t	iconvTo
     (
       const char	*fromPtr,
diff --git a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
index 100844ddd3db0bc85a9bbde4daa99c421b73c82f..ef4ad44c0c9970c0b91faca15d13e2b2edf25f5c 100644
--- a/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
+++ b/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
@@ -271,7 +271,7 @@ private :
     // -----------------------------------------------------------------------
     XMLTranscoder* const	mTranscoder;
 	MemoryManager* const	mManager;
-	XMLMutex				mMutex;			// Mutex to enable rentrancy of LCP transcoder
+	XMLMutex				mMutex;			// Mutex to enable reentrancy of LCP transcoder
  };
 
 XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/ValueArrayOf.c b/src/xercesc/util/ValueArrayOf.c
index 7c0525f2a3f192f2ab03b80b8fbd53b8c4beac4f..1683e1b679d5d3a312b706a9ea4fb7f2e0dcd2d4 100644
--- a/src/xercesc/util/ValueArrayOf.c
+++ b/src/xercesc/util/ValueArrayOf.c
@@ -31,7 +31,7 @@
 XERCES_CPP_NAMESPACE_BEGIN
 
 // ---------------------------------------------------------------------------
-//  ValueArrayOf: Contructors and Destructor
+//  ValueArrayOf: Constructors and Destructor
 // ---------------------------------------------------------------------------
 template <class TElem>
 ValueArrayOf<TElem>::ValueArrayOf(const XMLSize_t size,
@@ -203,7 +203,7 @@ resize(const XMLSize_t newSize)
     for (; index < newSize; index++)
         newArray[index] = TElem(0);
 
-    // Delete the old array and udpate our members
+    // Delete the old array and update our members
     fMemoryManager->deallocate(fArray); //delete [] fArray;
     fArray = newArray;
     fSize = newSize;
diff --git a/src/xercesc/util/ValueArrayOf.hpp b/src/xercesc/util/ValueArrayOf.hpp
index d17fd3b080c25f202042147197e7bd5a7ef9c977..e47631ec617d53c3bfe0c63aa924663681930193 100644
--- a/src/xercesc/util/ValueArrayOf.hpp
+++ b/src/xercesc/util/ValueArrayOf.hpp
@@ -34,7 +34,7 @@ template <class TElem> class ValueArrayOf : public XMemory
 {
 public :
     // -----------------------------------------------------------------------
-    //  Contructors and Destructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
     ValueArrayOf
     (
diff --git a/src/xercesc/util/XML88591Transcoder.hpp b/src/xercesc/util/XML88591Transcoder.hpp
index 9c085a3a375c18524db49d8e1f343d6178fa6425..5935278b5003ca6b57b805925e02513907b14801 100644
--- a/src/xercesc/util/XML88591Transcoder.hpp
+++ b/src/xercesc/util/XML88591Transcoder.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple 8859-1 transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLASCIITranscoder.hpp b/src/xercesc/util/XMLASCIITranscoder.hpp
index e318c5616dfd273dc4eb6de8036b79b22b293aac..dccd9921304ccd9128aecab507ce2efc7f2ade1c 100644
--- a/src/xercesc/util/XMLASCIITranscoder.hpp
+++ b/src/xercesc/util/XMLASCIITranscoder.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple ASCII transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLBigDecimal.hpp b/src/xercesc/util/XMLBigDecimal.hpp
index da40eec9efa19bc31cf1e0a27429b34f12d4c13f..23195623fde1a80843e0079642319a651b5a8fa9 100644
--- a/src/xercesc/util/XMLBigDecimal.hpp
+++ b/src/xercesc/util/XMLBigDecimal.hpp
@@ -123,7 +123,7 @@ private:
     void  cleanUp();
     
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------       
     XMLBigDecimal(const XMLBigDecimal& other);
     XMLBigDecimal& operator=(const XMLBigDecimal& other);        
@@ -135,7 +135,7 @@ private:
     //     sign
     //
     //  fTotalDigits
-    //     the total number of didits 
+    //     the total number of digits 
     //
     //  fScale
     //     the number of digits to the right of the decimal point
diff --git a/src/xercesc/util/XMLBigInteger.hpp b/src/xercesc/util/XMLBigInteger.hpp
index ad13b102c45c231f9dc819b999c28863e8fab58f..f49577fb2f6b7e15a44e7c0c4044fcad90ce9357 100644
--- a/src/xercesc/util/XMLBigInteger.hpp
+++ b/src/xercesc/util/XMLBigInteger.hpp
@@ -83,9 +83,9 @@ public:
     unsigned int       getTotalDigit() const;
    
     /**
-     *  Return a copy of the fMagnitue.
+     *  Return a copy of the fMagnitude.
      *  This is similar to toString, except the internal buffer is returned directly
-     *  Caller is not required to delet the returned memory.
+     *  Caller is not required to delete the returned memory.
      */
     inline XMLCh*      getRawData() const;
 
diff --git a/src/xercesc/util/XMLChar.hpp b/src/xercesc/util/XMLChar.hpp
index 2bf9c9d558e58d50be5b032a617baa8dfa48dcbc..4e2d3f13d44abc5e3ac2b87d7d36b034099646da 100644
--- a/src/xercesc/util/XMLChar.hpp
+++ b/src/xercesc/util/XMLChar.hpp
@@ -135,7 +135,7 @@ private:
     //      code and then hard coded into the cpp file for speed.
     //
     //  fNEL
-    //      Flag to respresents whether NEL and LSEP newline recognition is enabled
+    //      Flag to represents whether NEL and LSEP newline recognition is enabled
     //      or disabled
     // -----------------------------------------------------------------------
     static XMLByte  fgCharCharsTable1_0[0x10000];
diff --git a/src/xercesc/util/XMLDateTime.cpp b/src/xercesc/util/XMLDateTime.cpp
index 789ad821c229dd7e378a40effee57975195faac6..a45b8f93f5e907cd9c8802e506db596222c4f724 100644
--- a/src/xercesc/util/XMLDateTime.cpp
+++ b/src/xercesc/util/XMLDateTime.cpp
@@ -404,11 +404,11 @@ int XMLDateTime::compareOrder(const XMLDateTime* const lValue
 
     if ( lTemp.fHasTime)
     {
-        if ( lTemp.fMiliSecond < rTemp.fMiliSecond )
+        if ( lTemp.fMilliSecond < rTemp.fMilliSecond )
         {
             return LESS_THAN;
         }
-        else if ( lTemp.fMiliSecond > rTemp.fMiliSecond )
+        else if ( lTemp.fMilliSecond > rTemp.fMilliSecond )
         {
             return GREATER_THAN;
         }
@@ -430,7 +430,7 @@ XMLDateTime::XMLDateTime(MemoryManager* const manager)
 : fStart(0)
 , fEnd(0)
 , fBufferMaxLen(0)
-, fMiliSecond(0)
+, fMilliSecond(0)
 , fHasTime(false)
 , fBuffer(0)
 , fMemoryManager(manager)
@@ -443,7 +443,7 @@ XMLDateTime::XMLDateTime(const XMLCh* const aString,
 : fStart(0)
 , fEnd(0)
 , fBufferMaxLen(0)
-, fMiliSecond(0)
+, fMilliSecond(0)
 , fHasTime(false)
 , fBuffer(0)
 , fMemoryManager(manager)
@@ -924,7 +924,7 @@ void XMLDateTime::parseDuration()
                 }
 
                 fValue[Second]     = negate * parseInt(fStart, mlsec);
-                fMiliSecond        = negate * parseMiliSecond(mlsec+1, end);
+                fMilliSecond        = negate * parseMiliSecond(mlsec+1, end);
             }
             else
             {
@@ -1060,12 +1060,12 @@ void XMLDateTime::getTime()
 
         if ( sign == NOT_FOUND )
         {
-            fMiliSecond = parseMiliSecond(fStart, fEnd);  //get ms between '.' and fEnd
+            fMilliSecond = parseMiliSecond(fStart, fEnd);  //get ms between '.' and fEnd
             fStart = fEnd;
         }
         else
         {
-            fMiliSecond = parseMiliSecond(fStart, sign);  //get ms between UTC sign and fEnd
+            fMilliSecond = parseMiliSecond(fStart, sign);  //get ms between UTC sign and fEnd
         }
 	}
     else if(sign == 0 || XMLSize_t (sign) != fStart)
@@ -1331,7 +1331,7 @@ void XMLDateTime::validateDateTime() const
         (fValue[Hour] > 24) ||
         ((fValue[Hour] == 24) && ((fValue[Minute] !=0) ||
                                   (fValue[Second] !=0) ||
-                                  (fMiliSecond    !=0))))
+                                  (fMilliSecond    !=0))))
     {
         ThrowXMLwithMemMgr1(SchemaDateTimeException
                 , XMLExcepts::DateTime_hour_invalid
diff --git a/src/xercesc/util/XMLDateTime.hpp b/src/xercesc/util/XMLDateTime.hpp
index f58a997e05cc54518af0f6027c6d076a939d0273..c0bb16fbbf493fc295241c971f1826b7ce5df9ef 100644
--- a/src/xercesc/util/XMLDateTime.hpp
+++ b/src/xercesc/util/XMLDateTime.hpp
@@ -260,7 +260,7 @@ private:
     XMLSize_t    fEnd;
     XMLSize_t    fBufferMaxLen;
 
-    double       fMiliSecond;
+    double       fMilliSecond;
     bool         fHasTime;
 
     XMLCh*       fBuffer;
@@ -300,7 +300,7 @@ inline void XMLDateTime::reset()
     for ( int i=0; i < TOTAL_SIZE; i++ )
         fValue[i] = 0;
 
-    fMiliSecond   = 0;
+    fMilliSecond   = 0;
     fHasTime      = false;
     fTimeZone[hh] = fTimeZone[mm] = 0;
     fStart = fEnd = 0;
@@ -314,7 +314,7 @@ inline void XMLDateTime::copy(const XMLDateTime& rhs)
     for ( int i = 0; i < TOTAL_SIZE; i++ )
         fValue[i] = rhs.fValue[i];
 
-    fMiliSecond   = rhs.fMiliSecond;
+    fMilliSecond   = rhs.fMilliSecond;
     fHasTime      = rhs.fHasTime;
     fTimeZone[hh] = rhs.fTimeZone[hh];
     fTimeZone[mm] = rhs.fTimeZone[mm];
diff --git a/src/xercesc/util/XMLEBCDICTranscoder.hpp b/src/xercesc/util/XMLEBCDICTranscoder.hpp
index 792ddec8d6291218960d59e3790f3e079009d181..70153d24677d0fea6c3786ebeaab7f2a935e0d39 100644
--- a/src/xercesc/util/XMLEBCDICTranscoder.hpp
+++ b/src/xercesc/util/XMLEBCDICTranscoder.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple EBCDIC-US transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLExceptMsgs.hpp b/src/xercesc/util/XMLExceptMsgs.hpp
index d28c35393ccf948c05f5dfe6653f1cac7020bad0..fcefba7bea26ef9f1331c66dcd7fd08c6bf37677 100644
--- a/src/xercesc/util/XMLExceptMsgs.hpp
+++ b/src/xercesc/util/XMLExceptMsgs.hpp
@@ -106,7 +106,7 @@ public :
       , UTF8_Invalid_3BytesSeq             = 90
       , UTF8_Irregular_3BytesSeq           = 91
       , UTF8_Invalid_4BytesSeq             = 92
-      , UTF8_Exceede_BytesLimit            = 93
+      , UTF8_Exceeds_BytesLimit            = 93
       , Vector_BadIndex                    = 94
       , Val_InvalidElemId                  = 95
       , Val_CantHaveIntSS                  = 96
diff --git a/src/xercesc/util/XMLIBM1047Transcoder.hpp b/src/xercesc/util/XMLIBM1047Transcoder.hpp
index bc282c3c6cd94a6b39fe8fa1dbdbbe1e2752fd30..25393eec0f5e9f2b187c50429ea764ed491da1e6 100644
--- a/src/xercesc/util/XMLIBM1047Transcoder.hpp
+++ b/src/xercesc/util/XMLIBM1047Transcoder.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple 1047-US transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLIBM1140Transcoder.hpp b/src/xercesc/util/XMLIBM1140Transcoder.hpp
index 72aec4cabc3f65686ea3f2835b8ee9f0313cd88a..95384dba21fa86d66c5d98d76444f889c5122958 100644
--- a/src/xercesc/util/XMLIBM1140Transcoder.hpp
+++ b/src/xercesc/util/XMLIBM1140Transcoder.hpp
@@ -29,9 +29,9 @@ XERCES_CPP_NAMESPACE_BEGIN
 
 //
 //  This class provides an implementation of the XMLTranscoder interface
-//  for a simple ibm-1140 transcoder. The parser does some encodings
+//  for a simple IBM-1140 transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLMsgLoader.hpp b/src/xercesc/util/XMLMsgLoader.hpp
index 1adb3a299cfa24a27c96a08d886106a60b14bc5c..67b98528aafdeb4d6177c57e401d67ca7149beba 100644
--- a/src/xercesc/util/XMLMsgLoader.hpp
+++ b/src/xercesc/util/XMLMsgLoader.hpp
@@ -103,7 +103,7 @@ public :
       * This function enables set the locale information which
       * all concrete message loaders shall refer to during instantiation.
       *
-      * Note: for detailed discussion, refer to PlatformUtils::initalize()
+      * Note: for detailed discussion, refer to PlatformUtils::initialize()
       */
     static void           setLocale(const char* const localeToAdopt);
 
@@ -120,7 +120,7 @@ public :
       * This function enables set the NLSHome information which
       * all concrete message loaders shall refer to during instantiation.
       *
-      * Note: for detailed discussion, refer to PlatformUtils::initalize()
+      * Note: for detailed discussion, refer to PlatformUtils::initialize()
       */
     static void           setNLSHome(const char* const nlsHomeToAdopt);
 
diff --git a/src/xercesc/util/XMLString.hpp b/src/xercesc/util/XMLString.hpp
index 8ac6d653e8b7ea388553442e8b3fbc197228c7d6..c47c16fb78ba94dc5e1d541541b0ed8ba9566c0f 100644
--- a/src/xercesc/util/XMLString.hpp
+++ b/src/xercesc/util/XMLString.hpp
@@ -484,7 +484,7 @@ public:
     /** @name Search functions */
     //@{
     /**
-      * Provides the index of the first occurance of a character within a string
+      * Provides the index of the first occurrence of a character within a string
       *
       * @param toSearch The string to search
       * @param ch The character to search within the string
@@ -494,7 +494,7 @@ public:
     static int indexOf(const char* const toSearch, const char ch);
 
     /**
-      * Provides the index of the first occurance of a character within a string
+      * Provides the index of the first occurrence of a character within a string
       *
       * @param toSearch The string to search
       * @param ch The character to search within the string
@@ -504,7 +504,7 @@ public:
     static int indexOf(const XMLCh* const toSearch, const XMLCh ch);
 
 	    /**
-      * Provides the index of the first occurance of a character within a string
+      * Provides the index of the first occurrence of a character within a string
       * starting from a given index
       *
       * @param toSearch The string to search
@@ -523,7 +523,7 @@ public:
     );
 
     /**
-      * Provides the index of the first occurance of a character within a string
+      * Provides the index of the first occurrence of a character within a string
       * starting from a given index
       *
       * @param toSearch The string to search
@@ -542,7 +542,7 @@ public:
     );
 
     /**
-      * Provides the index of the last occurance of a character within a string
+      * Provides the index of the last occurrence of a character within a string
       *
       * @param toSearch The string to search
       * @param ch The character to search within the string
@@ -552,7 +552,7 @@ public:
     static int lastIndexOf(const char* const toSearch, const char ch);
 
     /**
-      * Provides the index of the last occurance of a character within a string
+      * Provides the index of the last occurrence of a character within a string
       *
       * @param toSearch The string to search
       * @param ch The character to search within the string
@@ -562,7 +562,7 @@ public:
     static int lastIndexOf(const XMLCh* const toSearch, const XMLCh ch);
 
     /**
-      * Provides the index of the last occurance of a character within a string
+      * Provides the index of the last occurrence of a character within a string
       *
       * @param ch The character to search within the string
       * @param toSearch The string to search
@@ -578,7 +578,7 @@ public:
     );
 
     /**
-      * Provides the index of the last occurance of a character within a string
+      * Provides the index of the last occurrence of a character within a string
       * starting backward from a given index
       *
       * @param toSearch The string to search
@@ -597,7 +597,7 @@ public:
     );
 
     /**
-      * Provides the index of the last occurance of a character within a string
+      * Provides the index of the last occurrence of a character within a string
       * starting backward from a given index
       *
       * @param toSearch The string to search
@@ -790,7 +790,7 @@ public:
     );
 
 
-    /** Tells if a string has any occurance of any character of another
+    /** Tells if a string has any occurrence of any character of another
       * string within itself
       * @param toSearch The string to be searched
       * @param searchList The string from which characters to be searched for are drawn
@@ -804,7 +804,7 @@ public:
         , const XMLCh* const    searchList
     );
 
-    /** Tells if a string has any occurance of any character of another
+    /** Tells if a string has any occurrence of any character of another
       * string within itself
       * @param toSearch The string to be searched
       * @param searchList The string from which characters to be searched for are drawn
@@ -1103,7 +1103,7 @@ public:
     /**
       * Converts a string of decimal chars to a binary value
       *
-      * Note that leading and trailng whitespace is legal and will be ignored
+      * Note that leading and trailing whitespace is legal and will be ignored
       * but the remainder must be all decimal digits.
       *
       * @param toConvert The string of digits to convert
@@ -1121,7 +1121,7 @@ public:
     /**
       * Converts a string of decimal chars to a binary value
       *
-      * Note that leading and trailng whitespace is legal and will be ignored,
+      * Note that leading and trailing whitespace is legal and will be ignored,
       *
       * Only one and either of (+,-) after the leading whitespace, before
       * any other characters are allowed.
@@ -1356,7 +1356,7 @@ public:
     /** Remove character
       * @param srcString The string
       * @param toRemove  The character needs to be removed from the string
-      * @param dstBuffer The buffer containning the result
+      * @param dstBuffer The buffer containing the result
       */
     static void removeChar(const XMLCh*     const srcString
                          , const XMLCh&           toRemove
diff --git a/src/xercesc/util/XMLStringTokenizer.hpp b/src/xercesc/util/XMLStringTokenizer.hpp
index 19f87ae611a2ec4d99ee9dd92f6da924a4f0daba..f948bf6077063d71724b452f4ef8084360a4e45d 100644
--- a/src/xercesc/util/XMLStringTokenizer.hpp
+++ b/src/xercesc/util/XMLStringTokenizer.hpp
@@ -153,7 +153,7 @@ private:
     //      The string to be parsed
 	//
     //  fDelimeters
-    //      A set of delimeter characters
+    //      A set of delimiter characters
     //
     //  fTokens
     //      A vector of the token strings
diff --git a/src/xercesc/util/XMLUCS4Transcoder.hpp b/src/xercesc/util/XMLUCS4Transcoder.hpp
index 331b1d344ebe5e3e7fddd3bb5a6a57bcbc9a06ab..2450f9ba8de27b954e43fba9c781c88184f2904f 100644
--- a/src/xercesc/util/XMLUCS4Transcoder.hpp
+++ b/src/xercesc/util/XMLUCS4Transcoder.hpp
@@ -31,7 +31,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple UCS4 transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
@@ -93,7 +93,7 @@ private :
     //  Private data members
     //
     //  fSwapped
-    //      This tells us if our input is going to be in the same endianess
+    //      This tells us if our input is going to be in the same endianness
     //      as the local host or swapped.
     // -----------------------------------------------------------------------
     bool    fSwapped;
diff --git a/src/xercesc/util/XMLUTF16Transcoder.hpp b/src/xercesc/util/XMLUTF16Transcoder.hpp
index 7f7e7575d82cef27fd8e6e180e0a1057352c6af1..a2478288ed2da51a810a20446ca4a60cf45322a0 100644
--- a/src/xercesc/util/XMLUTF16Transcoder.hpp
+++ b/src/xercesc/util/XMLUTF16Transcoder.hpp
@@ -32,7 +32,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple UTF16 transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMLUTF8Transcoder.cpp b/src/xercesc/util/XMLUTF8Transcoder.cpp
index 29ce8ab94f29edbb9344d6aa1413106c93e140ad..c78985860e9d8ec773b2aa208fa0fdc0561691a1 100644
--- a/src/xercesc/util/XMLUTF8Transcoder.cpp
+++ b/src/xercesc/util/XMLUTF8Transcoder.cpp
@@ -347,7 +347,7 @@ XMLUTF8Transcoder::transcodeFrom(const  XMLByte* const          srcData
                 char byte[2] = {*srcPtr,0};
 
                 ThrowXMLwithMemMgr2(UTFDataFormatException
-                                  , XMLExcepts::UTF8_Exceede_BytesLimit
+                                  , XMLExcepts::UTF8_Exceeds_BytesLimit
                                   , byte
                                   , len
                                   , getMemoryManager());
diff --git a/src/xercesc/util/XMLUTF8Transcoder.hpp b/src/xercesc/util/XMLUTF8Transcoder.hpp
index 020509bbcdfcef0c69fdbe32b89f7d9ff930793e..09ae3ad453bbd8435e0146f6d3c6c0767fbe204e 100644
--- a/src/xercesc/util/XMLUTF8Transcoder.hpp
+++ b/src/xercesc/util/XMLUTF8Transcoder.hpp
@@ -32,7 +32,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //  This class provides an implementation of the XMLTranscoder interface
 //  for a simple UTF8 transcoder. The parser does some encodings
 //  intrinsically without depending upon external transcoding services.
-//  To make everything more orthagonal, we implement these internal
+//  To make everything more orthogonal, we implement these internal
 //  transcoders using the same transcoder abstraction as the pluggable
 //  transcoding services do.
 //
diff --git a/src/xercesc/util/XMemory.hpp b/src/xercesc/util/XMemory.hpp
index 6bb33da746bf5d50f0165c7fe53055b96aafeade..869ccce937f0b9c403ec548495cefc7d8eb67f73 100644
--- a/src/xercesc/util/XMemory.hpp
+++ b/src/xercesc/util/XMemory.hpp
@@ -33,7 +33,7 @@ class MemoryManager;
  *  This class makes it possible to override the C++ memory management by
  *  adding new/delete operators to this base class.
  *
- *  This class is used in conjuction with the pluggable memory manager. It
+ *  This class is used in conjunction with the pluggable memory manager. It
  *  allows applications to control Xerces memory management.
  */
 
diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp
index 67d9e1d44514773c62da6c0ab20592f4bd4daa0e..80712600d8e46526cc62fdd5006a44d6271df702 100644
--- a/src/xercesc/util/XercesDefs.hpp
+++ b/src/xercesc/util/XercesDefs.hpp
@@ -87,7 +87,7 @@ typedef XMLUInt32           UCS4Ch;
 #endif
 
 // ---------------------------------------------------------------------------
-//  According to whether the compiler suports L"" type strings, we define
+//  According to whether the compiler supports L"" type strings, we define
 //  the XMLStrL() macro one way or another.
 // ---------------------------------------------------------------------------
 #if defined(XERCES_LSTRSUPPORT)
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index 74839df157180ba0e856f7bf4884e38eaa2d35a1..fe63bcfb33e3d2789a106184007fd4ef769cc2ef 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -47,7 +47,7 @@
  *
  *    The macro XERCES_GRAMMAR_SERIALIZATION_LEVEL has been added so that during
  *    development if users are using the latest code they can use the grammar
- *    serialization/desialization features.  Whenever a change is made to the
+ *    serialization/deserialization features.  Whenever a change is made to the
  *    serialization code this macro should be incremented.
  *
  * Xerces User Documentation:
diff --git a/src/xercesc/util/regx/BMPattern.hpp b/src/xercesc/util/regx/BMPattern.hpp
index d5b175d64ec0bac07481b018a325e1eb878e252a..ea1b64a2f5da6ce7613968991bdc7500de90454f 100644
--- a/src/xercesc/util/regx/BMPattern.hpp
+++ b/src/xercesc/util/regx/BMPattern.hpp
@@ -40,7 +40,7 @@ public:
     //@{
 
     /**
-      * This is the onstructor which takes the pattern information. A default
+      * This is the constructor which takes the pattern information. A default
       * shift table size is used.
       *
       * @param  pattern     The pattern to match against.
diff --git a/src/xercesc/util/regx/Op.hpp b/src/xercesc/util/regx/Op.hpp
index 4ad6797bb33e97e0205a09c12fc375116e9c5db7..426c535ac4ef5ca6901929b1ee99571076753055 100644
--- a/src/xercesc/util/regx/Op.hpp
+++ b/src/xercesc/util/regx/Op.hpp
@@ -157,7 +157,7 @@ public:
     void addElement(Op* const op);
 
 private:
-    // Private Data memebers
+    // Private Data members
     RefVectorOf<Op>* fBranches;
 
     // -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/DTD/DTDAttDefList.hpp b/src/xercesc/validators/DTD/DTDAttDefList.hpp
index c331385662fe1d001d7ac0d6108300ef1903474b..e034e215e21bf034a737a2ac91c2d5d1fd064705 100644
--- a/src/xercesc/validators/DTD/DTDAttDefList.hpp
+++ b/src/xercesc/validators/DTD/DTDAttDefList.hpp
@@ -36,7 +36,7 @@ XERCES_CPP_NAMESPACE_BEGIN
 //
 //  Since each validator can store attributes differently, this abstract
 //  interface allows each validator to provide an implementation of this
-//  data strucure that works best for it.
+//  data structure that works best for it.
 //
 //  For us, we just wrap the RefHashTableOf collection that the DTDElementDecl
 //  class uses to store the attributes that belong to it.
diff --git a/src/xercesc/validators/DTD/DTDElementDecl.hpp b/src/xercesc/validators/DTD/DTDElementDecl.hpp
index 72d856da4277bc0787533c88eefaedb44e9f7934..777950aef3f7fc036e4830159c26bcc47fcae04c 100644
--- a/src/xercesc/validators/DTD/DTDElementDecl.hpp
+++ b/src/xercesc/validators/DTD/DTDElementDecl.hpp
@@ -36,7 +36,7 @@ class DTDAttDefList;
 
 //
 //  This class is a derivative of the basic element decl. This one implements
-//  the virtuals so that they work for a DTD. THe big difference is that
+//  the virtuals so that they work for a DTD. The big difference is that
 //  they don't live in any URL in the DTD. The names are just stored as full
 //  QNames, so they are not split out and element decls don't live within
 //  URL namespaces or anything like that.
diff --git a/src/xercesc/validators/common/ContentSpecNode.hpp b/src/xercesc/validators/common/ContentSpecNode.hpp
index 38efbd4ea1f1349a91a7e125acd272e4a640ccc6..29b9be65fa50a9362e25b8c950fd47b358630502 100644
--- a/src/xercesc/validators/common/ContentSpecNode.hpp
+++ b/src/xercesc/validators/common/ContentSpecNode.hpp
@@ -161,7 +161,7 @@ private :
     //  fFirst
     //  fSecond
     //      The optional first and second nodes. The fType field indicates
-    //      which of these are valid. The validaty constraints are:
+    //      which of these are valid. The validity constraints are:
     //
     //          Leaf = Neither valid
     //          ZeroOrOne, ZeroOrMore = First
diff --git a/src/xercesc/validators/common/GrammarResolver.hpp b/src/xercesc/validators/common/GrammarResolver.hpp
index f1811a04f4ef7c7da65d48053af153ee5a54d1e2..eb4b3587b897e2ed3a7955e673d30ec54a41fb7f 100644
--- a/src/xercesc/validators/common/GrammarResolver.hpp
+++ b/src/xercesc/validators/common/GrammarResolver.hpp
@@ -216,7 +216,7 @@ private:
     //
     //  fGrammarPool           The Grammar Set either plugged or created. 
     //
-    //  fDataTypeReg           DatatypeValidatorFactory registery
+    //  fDataTypeReg           DatatypeValidatorFactory registry
     //
     //  fMemoryManager         Pluggable memory manager for dynamic memory
     //                         allocation/deallocation
diff --git a/src/xercesc/validators/datatype/DatatypeValidator.hpp b/src/xercesc/validators/datatype/DatatypeValidator.hpp
index 26c0c2125b60e05aa4f86a64d8c8ea679bff6a5c..185392299779173509b599713168b6f483b6069d 100644
--- a/src/xercesc/validators/datatype/DatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidator.hpp
@@ -220,7 +220,7 @@ public:
      *       if no memory manager is provided.
      *
      *    2. client application is responsible for the 
-     *       proper deallcation of the memory allocated
+     *       proper deallocation of the memory allocated
      *       for the returned value.
      *
      *    3. In the case where the rawData is not valid
@@ -346,7 +346,7 @@ public:
 
     /***
       *
-      *  Serialzie DatatypeValidator derivative 
+      *  Serialize DatatypeValidator derivative 
       *
       *  Param
       *     serEng: serialize engine
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
index 3fceedc5bac54cea915ba10417192c09b758ac21..a2453e988f2625f5bb1742b8225cd2de1cbeb266 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.cpp
@@ -538,33 +538,33 @@ void DatatypeValidatorFactory::initCanRepRegistory()
                         new  XMLCanRepGroup(XMLCanRepGroup::Decimal));
 
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_INTEGER),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_LONG),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_INT),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_SHORT),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_BYTE),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_NONNEGATIVEINTEGER),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_POSITIVEINTEGER),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_signed));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_signed));
 
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_NEGATIVEINTEGER),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_unsigned));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_unsigned));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_ULONG),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_unsigned));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_unsigned));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_UINT),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_unsigned));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_unsigned));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_USHORT),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_unsigned));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_unsigned));
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_UBYTE),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_unsigned));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_unsigned));
 
      fCanRepRegistry->put((void*) getDatatypeValidator(SchemaSymbols::fgDT_NONPOSITIVEINTEGER),
-                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derivated_npi));
+                        new  XMLCanRepGroup(XMLCanRepGroup::Decimal_Derived_npi));
 }
 
 /***
diff --git a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
index 68c572cbe3c9a30a5877675635eb801f8234465d..172a2f194c2bf11bf2c2c77f062b7f5d67fd7e02 100644
--- a/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
+++ b/src/xercesc/validators/datatype/DatatypeValidatorFactory.hpp
@@ -33,11 +33,11 @@
  * 9 validators) get initialized in the registry.
  * The initialization process consist of instantiating the Datatype and
  * facets and registering the Datatype into registry table.
- * This implementation uses a Hahtable as a registry. The datatype validators created
+ * This implementation uses a Hashtable as a registry. The datatype validators created
  * by the factory will be deleted by the registry.
  *
  * As the Parser parses an instance document it knows if validation needs
- * to be checked. If no validation is necesary we should not instantiate a
+ * to be checked. If no validation is necessary we should not instantiate a
  * DatatypeValidatorFactory.
  * If validation is needed, we need to instantiate a DatatypeValidatorFactory.
  */
diff --git a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
index 8722d970e3aae0c539598aace9396f807894d31d..bf1da8bf4ac641d140f7140dea72c94fe5184028 100644
--- a/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
+++ b/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -363,7 +363,7 @@ void DecimalDatatypeValidator::setEnumeration(MemoryManager* const manager)
         }
     }
 #if 0
-// spec says that only base has to checkContent          
+// spec says that only base has to checkContent
     // We put the this->checkContent in a separate loop
     // to not block original message with in that method.
     //
@@ -377,7 +377,7 @@ void DecimalDatatypeValidator::setEnumeration(MemoryManager* const manager)
 
     for ( i = 0; i < enumLength; i++)
     {
-        fEnumeration->insertElementAt(new (manager) XMLBigDecimal(fStrEnumeration->elementAt(i), manager), i);        
+        fEnumeration->insertElementAt(new (manager) XMLBigDecimal(fStrEnumeration->elementAt(i), manager), i);
     }
 
 }
@@ -416,8 +416,8 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
         return;
 
     XMLBigDecimal  compareDataValue(content, manager);
-    XMLBigDecimal* compareData = &compareDataValue;        
-        
+    XMLBigDecimal* compareData = &compareDataValue;
+
     if (getEnumeration())
     {
         XMLSize_t i=0;
@@ -437,7 +437,7 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
     if ( (thisFacetsDefined & DatatypeValidator::FACET_FRACTIONDIGITS) != 0 )
     {
         if ( compareData->getScale() > fFractionDigits )
-        {                
+        {
             XMLCh value1[BUF_LEN+1];
             XMLCh value2[BUF_LEN+1];
             XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
@@ -454,7 +454,7 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
     if ( (thisFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0 )
     {
         if ( compareData->getTotalDigit() > fTotalDigits )
-        {                
+        {
             XMLCh value1[BUF_LEN+1];
             XMLCh value2[BUF_LEN+1];
             XMLString::binToText(compareData->getTotalDigit(), value1, BUF_LEN, 10, manager);
@@ -473,8 +473,8 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
          where i and n are integers such that |i| < 10^totalDigits and 0 <= n <= totalDigits.
          ***/
 
-        if ( compareData->getScale() > fTotalDigits )  
-        {                
+        if ( compareData->getScale() > fTotalDigits )
+        {
             XMLCh value1[BUF_LEN+1];
             XMLCh value2[BUF_LEN+1];
             XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10, manager);
@@ -485,37 +485,37 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
                               , value1
                               , value2
                               , manager);
-        }        
+        }
     }
 }
 
 /***
- * 3.2.3 decimal  
+ * 3.2.3 decimal
  *
- * . the preceding optional "+" sign is prohibited. 
- * . The decimal point is required. 
- * . Leading and trailing zeroes are prohibited subject to the following: 
+ * . the preceding optional "+" sign is prohibited.
+ * . The decimal point is required.
+ * . Leading and trailing zeroes are prohibited subject to the following:
  *   there must be at least one digit to the right and to the left of the decimal point which may be a zero.
  *
  *
  *  3.3.13 integer
  *  3.3.16 long
  *  3.3.17 int
- *  3.3.18 short 
+ *  3.3.18 short
  *  3.3.19 byte
  *  3.3.20 nonNegativeInteger
  *  3.3.25 positiveInteger
  *
  *   . the preceding optional "+" sign is prohibited and
  *   . leading zeroes are prohibited.
- *   
+ *
  *
  *  E2-27
  *  3.3.14 nonPositiveInteger
  *
- *   . In the canonical form for zero, the sign must be omitted. 
+ *   . In the canonical form for zero, the sign must be omitted.
  *   . leading zeroes are prohibited.
- *  
+ *
  *  3.3.15 negativeInteger
  *  3.3.21 unsignedLong
  *  3.3.22 unsignedInt
@@ -523,7 +523,7 @@ void DecimalDatatypeValidator::checkContent(const XMLCh*             const conte
  *  3.3.24 unsignedByte
  *
  *  . leading zeroes are prohibited.
- *  
+ *
  *  Summary:
  *  . leading zeros are prohibited for all three groups
  *  . '-' is required for nonPositiveInteger if it is zero
@@ -541,7 +541,7 @@ const XMLCh* DecimalDatatypeValidator::getCanonicalRepresentation(const XMLCh*
     {
         try
         {
-            temp->checkContent(rawData, 0, false, toUse);   
+            temp->checkContent(rawData, 0, false, toUse);
         }
         catch (...)
         {
@@ -553,13 +553,13 @@ const XMLCh* DecimalDatatypeValidator::getCanonicalRepresentation(const XMLCh*
     // XMLBigDecimal::getCanonicalRepresentation will handle exceptional cases
     XMLCanRepGroup::CanRepGroup dvType = DatatypeValidatorFactory::getCanRepGroup(temp);
 
-    if ((dvType == XMLCanRepGroup::Decimal_Derivated_signed)   ||
-        (dvType == XMLCanRepGroup::Decimal_Derivated_unsigned) ||
-        (dvType == XMLCanRepGroup::Decimal_Derivated_npi)        )
-    {          
-        return XMLBigInteger::getCanonicalRepresentation(rawData, toUse, dvType == XMLCanRepGroup::Decimal_Derivated_npi);
+    if ((dvType == XMLCanRepGroup::Decimal_Derived_signed)   ||
+        (dvType == XMLCanRepGroup::Decimal_Derived_unsigned) ||
+        (dvType == XMLCanRepGroup::Decimal_Derived_npi)        )
+    {
+        return XMLBigInteger::getCanonicalRepresentation(rawData, toUse, dvType == XMLCanRepGroup::Decimal_Derived_npi);
     }
-    else if (dvType == XMLCanRepGroup::Decimal) 
+    else if (dvType == XMLCanRepGroup::Decimal)
     {
         return XMLBigDecimal::getCanonicalRepresentation(rawData, toUse);
     }
@@ -579,7 +579,7 @@ IMPL_XSERIALIZABLE_TOCREATE(DecimalDatatypeValidator)
 void DecimalDatatypeValidator::serialize(XSerializeEngine& serEng)
 {
     /***
-     * Note: 
+     * Note:
      *
      *     During storing, we need write the specific number
      *     type info before calling base::serialize().
@@ -594,7 +594,7 @@ void DecimalDatatypeValidator::serialize(XSerializeEngine& serEng)
 
     AbstractNumericValidator::serialize(serEng);
 
-    //don't serialize XMLBigDecimal*       
+    //don't serialize XMLBigDecimal*
     if (serEng.isStoring())
     {
         serEng<<fTotalDigits;
diff --git a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
index 8ef1fa1cb470ddb161bb43892fccd690d43861bb..9d696cc00140a603e680822d3616679ace8c3370 100644
--- a/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
+++ b/src/xercesc/validators/datatype/ListDatatypeValidator.hpp
@@ -189,7 +189,7 @@ private:
     //  Private data members
     //
     //  fContent
-    //      temporary var referenceing the content to be validated,
+    //      temporary var referencing the content to be validated,
     //      for error reporting purpose.
     //
     // -----------------------------------------------------------------------
diff --git a/src/xercesc/validators/datatype/XMLCanRepGroup.hpp b/src/xercesc/validators/datatype/XMLCanRepGroup.hpp
index d75ea10c3ac7cfe9e26defa32bcd7fa2c6c2496c..66c56bd9ed23fb94d45a35fb9a720eda984a1a65 100644
--- a/src/xercesc/validators/datatype/XMLCanRepGroup.hpp
+++ b/src/xercesc/validators/datatype/XMLCanRepGroup.hpp
@@ -36,9 +36,9 @@ public:
         DateTime,
         Time,
         Decimal,
-        Decimal_Derivated_signed,
-        Decimal_Derivated_unsigned,
-        Decimal_Derivated_npi,
+        Decimal_Derived_signed,
+        Decimal_Derived_unsigned,
+        Decimal_Derived_npi,
         String
     };
 
diff --git a/src/xercesc/validators/schema/ComplexTypeInfo.hpp b/src/xercesc/validators/schema/ComplexTypeInfo.hpp
index 1e04efbef4ea97f9ae16abccabf968f0878bbc25..5cd78ed5abfea35d0732b5299c51f4e942b71445 100644
--- a/src/xercesc/validators/schema/ComplexTypeInfo.hpp
+++ b/src/xercesc/validators/schema/ComplexTypeInfo.hpp
@@ -161,7 +161,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     ComplexTypeInfo(const ComplexTypeInfo& elemInfo);
     ComplexTypeInfo& operator= (const ComplexTypeInfo& other);
diff --git a/src/xercesc/validators/schema/PSVIDefs.hpp b/src/xercesc/validators/schema/PSVIDefs.hpp
index 3cf140fd2b7d963ffcc5c13c0cdeeb7fbbe12eba..4a66f8c1dc0f7f43dbf48f9a14b5b262a9df6edc 100644
--- a/src/xercesc/validators/schema/PSVIDefs.hpp
+++ b/src/xercesc/validators/schema/PSVIDefs.hpp
@@ -30,7 +30,7 @@ public:
     enum PSVIScope
     {
         SCP_ABSENT    // declared in group/attribute group
-	    , SCP_GLOBAL  // global decalarion or ref
+	    , SCP_GLOBAL  // global declaration or ref
 	    , SCP_LOCAL   // local declaration
     };
 };
diff --git a/src/xercesc/validators/schema/SchemaElementDecl.hpp b/src/xercesc/validators/schema/SchemaElementDecl.hpp
index 56d0e38573ce26a50bba2eb38305e71980d54f5e..f746cf65f25359e7159cac2354c34596c52db612 100644
--- a/src/xercesc/validators/schema/SchemaElementDecl.hpp
+++ b/src/xercesc/validators/schema/SchemaElementDecl.hpp
@@ -178,7 +178,7 @@ private :
     //      Stores 'abstract/nullable' values
     //
     //  fDefaultValue
-    //      The defalut/fixed value
+    //      The default/fixed value
     //
     //  fComplexTypeInfo
     //      Stores complex type information
diff --git a/src/xercesc/validators/schema/SchemaValidator.hpp b/src/xercesc/validators/schema/SchemaValidator.hpp
index 82d04943c85e43aafb05ba6bbdbb2da543ba6515..51b14f78928aad8e9a1c8f242adce139670813c4 100644
--- a/src/xercesc/validators/schema/SchemaValidator.hpp
+++ b/src/xercesc/validators/schema/SchemaValidator.hpp
@@ -146,7 +146,7 @@ private:
     SchemaValidator& operator=(const SchemaValidator&);
 
     // -----------------------------------------------------------------------
-    //  Element Consitency Checking methods
+    //  Element Consistency Checking methods
     // -----------------------------------------------------------------------
     void checkRefElementConsistency(SchemaGrammar* const currentGrammar,
                                     const ComplexTypeInfo* const curTypeInfo,
diff --git a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
index 8d7f82d5b6cf1bbb5248ac0ed9bf361279bb79c8..3c04c6c7669db42eb6e5b3dcbac962e18277a0e0 100644
--- a/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
+++ b/src/xercesc/validators/schema/SubstitutionGroupComparator.hpp
@@ -63,11 +63,11 @@ public:
     //@{
 
     /**
-	   * Checks that the "anElement" is within the subsitution group.
+	   * Checks that the "anElement" is within the substitution group.
 	   *
 	   * @param  anElement   QName of the element
 	   *
-	   * @param  exeplar     QName of the head element in the group
+	   * @param  exemplar     QName of the head element in the group
 	   */
     bool isEquivalentTo(const QName* const anElement
                       , const QName* const exemplar);
diff --git a/src/xercesc/validators/schema/TraverseSchema.hpp b/src/xercesc/validators/schema/TraverseSchema.hpp
index 9e5d16f20c9d3315c3e46b45b162ae11cec2d0b7..deec07ebb25781170ccf4d0e9c3299a1fb288339 100644
--- a/src/xercesc/validators/schema/TraverseSchema.hpp
+++ b/src/xercesc/validators/schema/TraverseSchema.hpp
@@ -246,7 +246,7 @@ private:
     void addImportedNS(const int namespaceURI);
 
     /**
-      * Retrived the Namespace mapping from the schema element
+      * Retrieved the Namespace mapping from the schema element
       */
     bool retrieveNamespaceMapping(const DOMElement* const elem);
 
diff --git a/src/xercesc/validators/schema/XSDDOMParser.hpp b/src/xercesc/validators/schema/XSDDOMParser.hpp
index bf31c5446c20d185f41f27ba0b3169a3fc7c72fd..43cf11cc8ac7a14bde2a97f6a25b96171b4bb2a0 100644
--- a/src/xercesc/validators/schema/XSDDOMParser.hpp
+++ b/src/xercesc/validators/schema/XSDDOMParser.hpp
@@ -41,7 +41,7 @@ class PARSERS_EXPORT XSDDOMParser : public XercesDOMParser
 public :
 
     // -----------------------------------------------------------------------
-    //  Constructors and Detructor
+    //  Constructors and Destructor
     // -----------------------------------------------------------------------
 
     /** @name Constructors and Destructor */
diff --git a/src/xercesc/validators/schema/XercesAttGroupInfo.hpp b/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
index d3350365005de2b2753607851ac4882d59767ac1..93b7ea746897eaaddafcf0be2f7006fe07095bac 100644
--- a/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
+++ b/src/xercesc/validators/schema/XercesAttGroupInfo.hpp
@@ -90,7 +90,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XercesAttGroupInfo(const XercesAttGroupInfo& elemInfo);
     XercesAttGroupInfo& operator= (const XercesAttGroupInfo& other);
diff --git a/src/xercesc/validators/schema/XercesGroupInfo.hpp b/src/xercesc/validators/schema/XercesGroupInfo.hpp
index b35aebdea9e673def0aaf1dbc4c25af0fe690836..3cd10586062f81396dcb3f0ff6b2bbec7e97bf97 100644
--- a/src/xercesc/validators/schema/XercesGroupInfo.hpp
+++ b/src/xercesc/validators/schema/XercesGroupInfo.hpp
@@ -92,7 +92,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XercesGroupInfo(const XercesGroupInfo& elemInfo);
     XercesGroupInfo& operator= (const XercesGroupInfo& other);
diff --git a/src/xercesc/validators/schema/identity/IC_Field.hpp b/src/xercesc/validators/schema/identity/IC_Field.hpp
index bef704c97345cfd9b3380b525fcd6ab2b6878ba0..ccb4e8219d5e98ece0a4e6dd2ca212c396416373 100644
--- a/src/xercesc/validators/schema/identity/IC_Field.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Field.hpp
@@ -80,7 +80,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IC_Field(const IC_Field& other);
     IC_Field& operator= (const IC_Field& other);
@@ -124,7 +124,7 @@ private:
                  MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
 
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     FieldMatcher(const FieldMatcher& other);
     FieldMatcher& operator= (const FieldMatcher& other);
diff --git a/src/xercesc/validators/schema/identity/IC_Key.hpp b/src/xercesc/validators/schema/identity/IC_Key.hpp
index 383df05f15ad26d78fd60ed0ea87e8525c4cd529..8d476bc9bd7c430a4ab5b4fb3b3cf0dbe87d9f2c 100644
--- a/src/xercesc/validators/schema/identity/IC_Key.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Key.hpp
@@ -55,7 +55,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IC_Key(const IC_Key& other);
     IC_Key& operator= (const IC_Key& other);
diff --git a/src/xercesc/validators/schema/identity/IC_KeyRef.hpp b/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
index 31cf2ed199bd1c8cec3872e1e90159828318843c..cdc8b1ad00b65ee7b075e6ce74dd0393e20d90fa 100644
--- a/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
+++ b/src/xercesc/validators/schema/identity/IC_KeyRef.hpp
@@ -57,7 +57,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IC_KeyRef(const IC_KeyRef& other);
     IC_KeyRef& operator= (const IC_KeyRef& other);
diff --git a/src/xercesc/validators/schema/identity/IC_Selector.hpp b/src/xercesc/validators/schema/identity/IC_Selector.hpp
index 46784bff452de6ae4591532206872e2044674428..8744c177d34f4cc66fc5f5a9e0ea8b6008250df9 100644
--- a/src/xercesc/validators/schema/identity/IC_Selector.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Selector.hpp
@@ -76,7 +76,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IC_Selector(const IC_Selector& other);
     IC_Selector& operator= (const IC_Selector& other);
@@ -125,7 +125,7 @@ private:
                     MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
 
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     SelectorMatcher(const SelectorMatcher& other);
     SelectorMatcher& operator= (const SelectorMatcher& other);
diff --git a/src/xercesc/validators/schema/identity/IC_Unique.hpp b/src/xercesc/validators/schema/identity/IC_Unique.hpp
index 9a185b8e7e0cd1411d27fac4df6e29612cafed77..267fb2896baf534f2f1a39ba825013d974f023dd 100644
--- a/src/xercesc/validators/schema/identity/IC_Unique.hpp
+++ b/src/xercesc/validators/schema/identity/IC_Unique.hpp
@@ -59,7 +59,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IC_Unique(const IC_Unique& other);
     IC_Unique& operator= (const IC_Unique& other);
diff --git a/src/xercesc/validators/schema/identity/IdentityConstraint.hpp b/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
index 467941c7c7d2f3bf73998d8f98edb1f34d9c0aa3..f0c18597fad072d81a03e183e2a756f66bdd7219 100644
--- a/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
+++ b/src/xercesc/validators/schema/identity/IdentityConstraint.hpp
@@ -109,7 +109,7 @@ protected:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IdentityConstraint(const IdentityConstraint& other);
     IdentityConstraint& operator= (const IdentityConstraint& other);
diff --git a/src/xercesc/validators/schema/identity/IdentityConstraintHandler.hpp b/src/xercesc/validators/schema/identity/IdentityConstraintHandler.hpp
index b58fc544a2c3334e2432b338e5443bfbaf858750..75eb2c26de7a2d6a67b3d7dbce7428a7a5512579 100644
--- a/src/xercesc/validators/schema/identity/IdentityConstraintHandler.hpp
+++ b/src/xercesc/validators/schema/identity/IdentityConstraintHandler.hpp
@@ -89,7 +89,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     IdentityConstraintHandler(const IdentityConstraintHandler& other);
     IdentityConstraintHandler& operator= (const IdentityConstraintHandler& other);
diff --git a/src/xercesc/validators/schema/identity/ValueStore.hpp b/src/xercesc/validators/schema/identity/ValueStore.hpp
index bffc0616402d0062b1010a27df50023b3030cfea..9dda3e99ab5d8423ba344a7a6aded35518e9012d 100644
--- a/src/xercesc/validators/schema/identity/ValueStore.hpp
+++ b/src/xercesc/validators/schema/identity/ValueStore.hpp
@@ -111,7 +111,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     ValueStore(const ValueStore& other);
     ValueStore& operator= (const ValueStore& other);
diff --git a/src/xercesc/validators/schema/identity/ValueStoreCache.hpp b/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
index ccff12d5139f9a01b71d4bf05d9a26a9b30e1ea0..cf02064d8622fbc86ed68e7c284dc21baab0145d 100644
--- a/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
+++ b/src/xercesc/validators/schema/identity/ValueStoreCache.hpp
@@ -53,7 +53,7 @@
 XERCES_CPP_NAMESPACE_BEGIN
 
 // ---------------------------------------------------------------------------
-//  Forward Declcaration
+//  Forward Declaration
 // ---------------------------------------------------------------------------
 class ValueStore;
 class SchemaElementDecl;
@@ -92,7 +92,7 @@ public:
     //  Access methods
     // -----------------------------------------------------------------------
     ValueStore* getValueStoreFor(const IC_Field* const field, const int initialDepth);
-    ValueStore* getValueStoreFor(const IdentityConstraint* const ic, const int intialDepth);
+    ValueStore* getValueStoreFor(const IdentityConstraint* const ic, const int initialDepth);
     ValueStore* getGlobalValueStoreFor(const IdentityConstraint* const ic);
 
 	// -----------------------------------------------------------------------
@@ -106,7 +106,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     ValueStoreCache(const ValueStoreCache& other);
     ValueStoreCache& operator= (const ValueStoreCache& other);
diff --git a/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp b/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
index 07d9812f744b1898b7b9cbc816b6cf16d52274ea..46561f327f51375e5fe840149f550050de4c64c7 100644
--- a/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
+++ b/src/xercesc/validators/schema/identity/XPathMatcherStack.hpp
@@ -69,7 +69,7 @@ private:
     void cleanUp();
 
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XPathMatcherStack(const XPathMatcherStack& other);
     XPathMatcherStack& operator= (const XPathMatcherStack& other);
diff --git a/src/xercesc/validators/schema/identity/XercesXPath.hpp b/src/xercesc/validators/schema/identity/XercesXPath.hpp
index 8d47d2b6e0271af4e48e5544f196d0945932cfe8..d93cfd20c25324fc99b09ff1a7f105732f324fe2 100644
--- a/src/xercesc/validators/schema/identity/XercesXPath.hpp
+++ b/src/xercesc/validators/schema/identity/XercesXPath.hpp
@@ -180,7 +180,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XercesLocationPath(const XercesLocationPath& other);
     XercesLocationPath& operator= (const XercesLocationPath& other);
@@ -288,7 +288,7 @@ public:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XercesXPath(const XercesXPath& other);
     XercesXPath& operator= (const XercesXPath& other);
@@ -373,7 +373,7 @@ protected:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XPathScanner(const XPathScanner& other);
     XPathScanner& operator= (const XPathScanner& other);
@@ -438,7 +438,7 @@ protected:
 
 private:
     // -----------------------------------------------------------------------
-    //  Unimplemented contstructors and operators
+    //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
     XPathScannerForSchema(const XPathScannerForSchema& other);
     XPathScannerForSchema& operator= (const XPathScannerForSchema& other);