Adding references to XMLwrapp the C++ wrapper, Daniel
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 634f3f5..d31c725 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -121,7 +121,7 @@
 </p>
 <p>Most linux and Bsd distribution includes libxml, this is probably the
     safer way for end-users</p>
-<p>David Doolin provides precompiled Windows versions at <a href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/         ">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a>
+<p>David Doolin provides precompiled Windows versions at <a href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/%20%20%20%20%20%20%20%20%20">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a>
 </p>
 </li>
 <li>
@@ -318,13 +318,20 @@
     <p>libxml is written in pure C in order to allow easy reuse on a number
     of platforms, including embedded systems. I don't intend to convert to
     C++.</p>
-<p>There is however a C++ wrapper provided by Ari Johnson
-    &lt;ari@btigate.com&gt; which may fullfill your needs:</p>
-<p>Website: <a href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a>
+<p>There is however a few C++ wrappers which may fullfill your needs:</p>
+<ul>
+<li>by Ari Johnson &lt;ari@btigate.com&gt;:
+        <p>Website: <a href="http://lusis.org/~ari/xml%2B%2B/">http://lusis.org/~ari/xml++/</a>
 </p>
-<p>Download: <a href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
+<p>Download: <a href="http://lusis.org/~ari/xml%2B%2B/libxml%2B%2B.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
 </p>
 </li>
+<li>by Peter Jones &lt;pjones@pmade.org&gt;
+        <p>Website: <a href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a>
+</p>
+</li>
+</ul>
+</li>
 <li>How to validate a document a posteriori ?
     <p>It is possible to validate documents which had not been validated at
     initial parsing time or documents who have been built from scratch using
diff --git a/doc/contribs.html b/doc/contribs.html
index 16cebe2..37218f1 100644
--- a/doc/contribs.html
+++ b/doc/contribs.html
@@ -92,12 +92,6 @@
     and Solaris port.</li>
 <li>John Fleck helps maintaining the documentation and man pages.</li>
 <li>
-<a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
-    for libxml:<br>
-    Website: <a href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
-    Download: <a href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
-</li>
-<li>
 <a href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now
     the maintainer of the Windows port, <a href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
     provides binaries</a>
diff --git a/doc/python.html b/doc/python.html
index 0c76415..e84d9dc 100644
--- a/doc/python.html
+++ b/doc/python.html
@@ -95,11 +95,15 @@
 <li>
 <a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
     for libxml:<br>
-    Website: <a href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
-    Download: <a href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
+    Website: <a href="http://lusis.org/~ari/xml%2B%2B/">http://lusis.org/~ari/xml++/</a><br>
+    Download: <a href="http://lusis.org/~ari/xml%2B%2B/libxml%2B%2B.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
 </li>
 <li>There is another <a href="http://libgdome-cpp.berlios.de/">C++ wrapper
     based on the gdome2 </a>bindings maintained by Tobias Peters.</li>
+<li>and a third C++ wrapper by Peter Jones &lt;pjones@pmade.org&gt;
+    <p>Website: <a href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a>
+</p>
+</li>
 <li>
 <a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
     Sergeant</a> developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
diff --git a/doc/upgrade.html b/doc/upgrade.html
index fc5d08e..1fbc84e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -107,7 +107,7 @@
 <p>So client code of libxml designed to run with version 1.x may have to be
 changed to compile against version 2.x of libxml. Here is a list of changes
 that I have collected, they may not be sufficient, so in case you find other
-change which are required, <a href="mailto:Daniel.Ïeillardw3.org">drop me a
+change which are required, <a href="mailto:Daniel.%C3%8Feillardw3.org">drop me a
 mail</a>:</p>
 <ol>
 <li>The package name have changed from libxml to libxml2, the library name
diff --git a/doc/xml.html b/doc/xml.html
index 95f9c14..0e6ee7f 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -372,12 +372,19 @@
     <p>libxml is written in pure C in order to allow easy reuse on a number
     of platforms, including embedded systems. I don't intend to convert to
     C++.</p>
-    <p>There is however a C++ wrapper provided by Ari Johnson
-    &lt;ari@btigate.com&gt; which may fullfill your needs:</p>
-    <p>Website: <a
-    href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a></p>
-    <p>Download: <a
-    href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a></p>
+    <p>There is however a few C++ wrappers which may fullfill your needs:</p>
+    <ul>
+      <li>by Ari Johnson &lt;ari@btigate.com&gt;:
+        <p>Website: <a
+        href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a></p>
+        <p>Download: <a
+        href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a></p>
+      </li>
+      <li>by Peter Jones &lt;pjones@pmade.org&gt;
+        <p>Website: <a
+        href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a></p>
+      </li>
+    </ul>
   </li>
   <li>How to validate a document a posteriori ?
     <p>It is possible to validate documents which had not been validated at
@@ -1384,6 +1391,10 @@
     href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a></li>
   <li>There is another <a href="http://libgdome-cpp.berlios.de/">C++ wrapper
     based on the gdome2 </a>bindings maintained by Tobias Peters.</li>
+  <li>and a third C++ wrapper by Peter Jones &lt;pjones@pmade.org&gt;
+    <p>Website: <a
+    href="http://pmade.org/pjones/software/xmlwrapp/">http://pmade.org/pjones/software/xmlwrapp/</a></p>
+  </li>
   <li><a
     href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
     Sergeant</a> developped <a
@@ -2600,6 +2611,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document:
@@ -3728,12 +3740,6 @@
     patches, Gary Pennington worked on the validation API, threading support
     and Solaris port.</li>
   <li>John Fleck helps maintaining the documentation and man pages.</li>
-  <li><a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
-    for libxml:<br>
-    Website: <a
-    href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
-    Download: <a
-    href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a></li>
   <li><a href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now
     the maintainer of the Windows port, <a
     href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 7d9153f..e61735b 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -233,6 +233,7 @@
 
 
 
+
 } </pre>
 </li>
 <li>And then use it to save the document: