Updated instruction for libxml2 and libxml coexistence, Daniel
diff --git a/doc/FAQ.html b/doc/FAQ.html
index a0153b6..2aa491b 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -43,8 +43,8 @@
   <li><em>Can I embed libxml in a proprietary application ?</em>
     <p>Yes. The W3C IPR allows you to also keep proprietary the changes you
     made to libxml, but it would be graceful to provide back bugfixes and
-    improvements as patches for possible incorporation in the main
-    development tree</p>
+    improvements as patches for possible incorporation in the main development
+    tree</p>
   </li>
 </ol>
 
@@ -70,12 +70,11 @@
         compatible (this is not the case for development packages)</li>
       <li>If you are a developer and your system provides separate packaging
         for shared libraries and the development components, it is possible to
-        install libxml and libxml2, and depending on your development needs
-        have either <a
+        install libxml and libxml2, and also <a
         href="http://rpmfind.net/linux/RPM/libxml-devel.html">libxml-devel</a>
-        or <a
+        and <a
         href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml2-devel</a>
-        too</li>
+        too for libxml2 &gt;= 2.3.0</li>
       <li>If you are developing a new application, please develop against
         libxml2(-devel)</li>
     </ul>
@@ -147,7 +146,8 @@
 &lt;NODE CommFlag="0"/&gt;
 &lt;NODE CommFlag="1"/&gt;
 &lt;/PLAN&gt;</pre>
-    <p><em>after parsing it with the function pxmlDoc=xmlParseFile(...);</em></p>
+    <p><em>after parsing it with the function
+    pxmlDoc=xmlParseFile(...);</em></p>
     <p><em>I want to the get the content of the first node (node with the
     CommFlag="0")</em></p>
     <p><em>so I did it as following;</em></p>
@@ -185,7 +185,7 @@
   <li><em>XPath implementation looks seriously broken</em>
     <p>XPath implementation prior to 2.3.0 was really incomplete, upgrade to a
     recent version, the implementation and debug of libxslt generated fixes
-    for most obvious problems. </p>
+    for most obvious problems.</p>
   </li>
   <li><em>The example provided in the web page does not compile</em>
     <p>It's hard to maintain the documentation in sync with the code
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 50aaa6a..120cad0 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                      "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
   <title>Upgrading libxml client code from 1.x to 2.x</title>
-  <meta name="GENERATOR" content="amaya V2.1">
+  <meta name="GENERATOR" content="amaya V4.1">
   <meta http-equiv="Content-Type" content="text/html">
 </head>
 
@@ -37,6 +35,9 @@
 change which are required, <a href="mailto:Daniel.Ïeillardw3.org">drop me a
 mail</a>:</p>
 <ol>
+  <li>The package name have changed from libxml to libxml2, the library name
+    is now -lxml2 . There is a new xml2-config script which should be used to
+    select the right parameters libxml2</li>
   <li>Node <strong>childs</strong> field has been renamed
     <strong>children</strong> so s/childs/children/g should be  applied
     (probablility of having "childs" anywere else is close to 0+</li>
@@ -47,8 +48,8 @@
     instructions or comments found before or after the document root element.
     Use <strong>xmlDocGetRootElement(doc)</strong> to get the root element of
     a document. Alternatively if you are sure to not reference Dtds nor have
-    PIs or comments before or after the root element s/->root/->children/g
-    will probably do it.</li>
+    PIs or comments before or after the root element
+    s/-&gt;root/-&gt;children/g will probably do it.</li>
   <li>The white space issue, this one is more complex, unless special case of
     validating parsing, the line breaks and spaces usually used for indenting
     and formatting the document content becomes significant. So they are
@@ -74,7 +75,7 @@
   <li>The include path has changed to $prefix/libxml/ and the includes
     themselves uses this new prefix in includes instructions... If you are
     using (as expected) the
-    <pre>xml-config --cflags</pre>
+    <pre>xml2-config --cflags</pre>
     <p>output to generate you compile commands this will probably work out of
     the box</p>
   </li>
@@ -82,12 +83,12 @@
 
 <h2>Ensuring both libxml-1.x and libxml-2.x compatibility</h2>
 
-<p>Two new version of libxml (1.8.8) and libxml2 (2.1.0) have been released to
-allow smoth upgrade of existing libxml v1code while retaining compatibility.
-They offers the following:</p>
+<p>Two new version of libxml (1.8.11) and libxml2 (2.3.4) have been released
+to allow smoth upgrade of existing libxml v1code while retaining
+compatibility. They offers the following:</p>
 <ol>
   <li>similar include naming, one should use
-    <strong>#include&lt;libxml/...></strong> in both cases.</li>
+    <strong>#include&lt;libxml/...&gt;</strong> in both cases.</li>
   <li>similar identifiers defined via macros for the child and root fields:
     respectively <strong>xmlChildrenNode</strong> and
     <strong>xmlRootNode</strong></li>
@@ -106,9 +107,11 @@
   <li>add a <strong>LIBXML_TEST_VERSION</strong> macro somewhere in your
     <strong>main()</strong> or in the library init entry point</li>
   <li>Recompile, check compatibility, it should still work</li>
-  <li>install libxml2-2.1.0, remove libxml-devel-1.8.8 and install
-    libxml2-devel-2.1.0 (libxml-1.8.8 can be kept installed for legacy
-  stuff)</li>
+  <li>Change your configure script to look first for xml2-config and fallback
+    using xml-config . Use the --cflags and --libs ouptut of the command as
+    the Include and Linking parameters needed to use libxml.</li>
+  <li>install libxml2-2.3.x and  libxml2-devel-2.3.x (libxml-1.8.y and
+    libxml-devel-1.8.y can be kept simultaneously)</li>
   <li>remove your config.cache, relaunch your configuration mechanism, and
     recompile, if steps 2 and 3 were done right it should compile as-is</li>
   <li>Test that your application is still running correctly, if not this may
@@ -128,6 +131,6 @@
 
 <p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
 
-<p>$Id: upgrade.html,v 1.6 2000/06/29 00:43:26 veillard Exp $</p>
+<p>$Id: upgrade.html,v 1.7 2000/06/30 18:39:56 veillard Exp $</p>
 </body>
 </html>