diff --git a/doc/html/apiDocs/header.html b/doc/html/apiDocs/header.html
index 623137af27a4f3a1125d95a852dd93432a2d3a6f..e3b08376dcc0fcd9f48468c06c385dc7221d0354 100644
--- a/doc/html/apiDocs/header.html
+++ b/doc/html/apiDocs/header.html
@@ -72,10 +72,10 @@
<A href="http://svn.apache.org/viewcvs.cgi/xerces/?root=Apache-SVN" onMouseOut="rolloverOff('side-ext-102');" onMouseOver="rolloverOn('side-ext-102');"><IMG alt="Source Repository" border="0" height="12" hspace="0" name="side-ext-102" onLoad="rolloverLoad('side-ext-102','../graphics/ext-102-label-2.jpg','../graphics/ext-102-label-3.jpg');" src="../graphics/ext-102-label-3.jpg" vspace="0" width="120"></A><BR>
-<A href="http://marc.theaimsgroup.com/?l=c-users" onMouseOut="rolloverOff('side-ext-104');" onMouseOver="rolloverOn('side-ext-104');"><IMG alt="User Mail Archive" border="0" height="12" hspace="0" name="side-ext-104" onLoad="rolloverLoad('side-ext-104','../graphics/ext-104-label-2.jpg','../graphics/ext-104-label-3.jpg');" src="../graphics/ext-104-label-3.jpg" vspace="0" width="120"></A><BR>
+<A href="http://marc.theaimsgroup.com/?l=xerces-c-users" onMouseOut="rolloverOff('side-ext-104');" onMouseOver="rolloverOn('side-ext-104');"><IMG alt="User Mail Archive" border="0" height="12" hspace="0" name="side-ext-104" onLoad="rolloverLoad('side-ext-104','../graphics/ext-104-label-2.jpg','../graphics/ext-104-label-3.jpg');" src="../graphics/ext-104-label-3.jpg" vspace="0" width="120"></A><BR>
-<A href="http://marc.theaimsgroup.com/?l=c-dev" onMouseOut="rolloverOff('side-ext-106');" onMouseOver="rolloverOn('side-ext-106');"><IMG alt="Devel Mail Archive" border="0" height="12" hspace="0" name="side-ext-106" onLoad="rolloverLoad('side-ext-106','../graphics/ext-106-label-2.jpg','../graphics/ext-106-label-3.jpg');" src="../graphics/ext-106-label-3.jpg" vspace="0" width="120"></A><BR>
+<A href="http://marc.theaimsgroup.com/?l=xerces-c-dev" onMouseOut="rolloverOff('side-ext-106');" onMouseOver="rolloverOn('side-ext-106');"><IMG alt="Devel Mail Archive" border="0" height="12" hspace="0" name="side-ext-106" onLoad="rolloverLoad('side-ext-106','../graphics/ext-106-label-2.jpg','../graphics/ext-106-label-3.jpg');" src="../graphics/ext-106-label-3.jpg" vspace="0" width="120"></A><BR>
diff --git a/doc/releases_plan.xml b/doc/releases_plan.xml
index b9a171deb33bfee66ef4fa8ab53417781bcd657b..7b7602ba9eb97564ebb85407d257d5087f1b1227 100644
--- a/doc/releases_plan.xml
+++ b/doc/releases_plan.xml
@@ -44,7 +44,7 @@
<p>The following table lists the potential TODO items for &XercesCName; 3.0.
It does not include fixing bugs that are opened in Jira; unless such Jira bug
involves a major development effort and requires an architectural redesign,
- or is an enhancement suggestion,</p>
+ or is an enhancement suggestion.</p>
<p>This list tracks current ideas and developer sign-up for 3.0 features. Some items
on this list have no volunteer. Items that have no volunteer will receive no
diff --git a/doc/style/dtd/entities.ent b/doc/style/dtd/entities.ent
index 7694b7b83de13465658d6c7cdbc9c5afca3a56a7..fec49386b0b4ff1dc09760a6fd734a16a29c91fa 100644
--- a/doc/style/dtd/entities.ent
+++ b/doc/style/dtd/entities.ent
@@ -14,8 +14,8 @@
<!ENTITY XercesCUnixLib "libxerces-c"> <!-- unixlibname -->
<!ENTITY XercesCNamespace "xercesc"> <!-- C++ namespace name -->
<!ENTITY XercesCNSVersion "xercesc_2_6"> <!-- C++ namespace name with Version -->
-<!ENTITY XercesCDevelEmailAddress "c-dev@xerces.apache.org "> <!-- emailaddress -->
-<!ENTITY XercesCUserEmailAddress "c-users@xerces.apache.org "> <!-- emailaddress -->
+<!ENTITY XercesCDevelEmailAddress "xerces-c-dev@xerces.apache.org "> <!-- emailaddress -->
+<!ENTITY XercesCUserEmailAddress "xerces-c-users@xerces.apache.org "> <!-- emailaddress -->
<!ENTITY JiraURL "http://issues.apache.org/jira/browse/XERCESC "> <!-- url -->
<!ENTITY XercesDistDir "xml.apache.org/xerces-c/download.cgi"> <!-- download directory -->
@@ -93,7 +93,7 @@ since your contribution may lead to a quicker identification/resolution to the b
outstanding bugs</jump> that are currently reported in Jira.
</p>
</s2>
-<s2 title="Write good bug report">
+<s2 title="Write a good bug report">
<p> Writing a useful bug report, which makes the bug reproducible, is the first step
towards the resolution of the bug. Specifics about the bug, like
</p>