damn XML_FEATURE_UNICODE clashes with Expat headers rename to XML_WITH_ to

* include/libxml/parser.h parser.c xmllint.c: damn XML_FEATURE_UNICODE
  clashes with Expat headers rename to XML_WITH_ to fix bug #316053.
* doc/Makefile.am: build devhelp before the examples.
* doc/*: regenerated the API
Daniel

16 files changed, 386 insertions, 364 deletions

diff --git a/ChangeLog b/ChangeLog
index 2639ad3a..688f2cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 12 11:12:03 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+	* include/libxml/parser.h parser.c xmllint.c: damn XML_FEATURE_UNICODE
+	  clashes with Expat headers rename to XML_WITH_ to fix bug #316053. 
+	* doc/Makefile.am: build devhelp before the examples.
+	* doc/*: regenerated the API
+
 Mon Sep 12 02:03:12 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* xmlsave.c: fix bug #316034, where xmlElemDump() can crash if 
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index b275cf76..d933933a 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -576,37 +576,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 </p><h2><a name="parser" id="parser">Module parser</a>:</h2><p><a href="html/libxml-parser.html#XML_COMPLETE_ATTRS">XML_COMPLETE_ATTRS</a><br />
 <a href="html/libxml-parser.html#XML_DEFAULT_VERSION">XML_DEFAULT_VERSION</a><br />
 <a href="html/libxml-parser.html#XML_DETECT_IDS">XML_DETECT_IDS</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_AUTOMATA">XML_FEATURE_AUTOMATA</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_C14N">XML_FEATURE_C14N</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_CATALOG">XML_FEATURE_CATALOG</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG">XML_FEATURE_DEBUG</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG_MEM">XML_FEATURE_DEBUG_MEM</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG_RUN">XML_FEATURE_DEBUG_RUN</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_EXPR">XML_FEATURE_EXPR</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_FTP">XML_FEATURE_FTP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_HTML">XML_FEATURE_HTML</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_HTTP">XML_FEATURE_HTTP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_ICONV">XML_FEATURE_ICONV</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_ISO8859X">XML_FEATURE_ISO8859X</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_LEGACY">XML_FEATURE_LEGACY</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_MODULES">XML_FEATURE_MODULES</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_NONE">XML_FEATURE_NONE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_OUTPUT">XML_FEATURE_OUTPUT</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_PATTERN">XML_FEATURE_PATTERN</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_PUSH">XML_FEATURE_PUSH</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_READER">XML_FEATURE_READER</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_REGEXP">XML_FEATURE_REGEXP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SAX1">XML_FEATURE_SAX1</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SCHEMAS">XML_FEATURE_SCHEMAS</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SCHEMATRON">XML_FEATURE_SCHEMATRON</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_THREAD">XML_FEATURE_THREAD</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_TREE">XML_FEATURE_TREE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_UNICODE">XML_FEATURE_UNICODE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_VALID">XML_FEATURE_VALID</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_WRITER">XML_FEATURE_WRITER</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XINCLUDE">XML_FEATURE_XINCLUDE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XPATH">XML_FEATURE_XPATH</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XPTR">XML_FEATURE_XPTR</a><br />
 <a href="html/libxml-parser.html#XML_PARSER_ATTRIBUTE_VALUE">XML_PARSER_ATTRIBUTE_VALUE</a><br />
 <a href="html/libxml-parser.html#XML_PARSER_CDATA_SECTION">XML_PARSER_CDATA_SECTION</a><br />
 <a href="html/libxml-parser.html#XML_PARSER_COMMENT">XML_PARSER_COMMENT</a><br />
@@ -650,6 +619,37 @@ A:link, A:visited, A:active { text-decoration: underline }
 <a href="html/libxml-parser.html#XML_PARSE_XINCLUDE">XML_PARSE_XINCLUDE</a><br />
 <a href="html/libxml-parser.html#XML_SAX2_MAGIC">XML_SAX2_MAGIC</a><br />
 <a href="html/libxml-parser.html#XML_SKIP_IDS">XML_SKIP_IDS</a><br />
+<a href="html/libxml-parser.html#XML_WITH_AUTOMATA">XML_WITH_AUTOMATA</a><br />
+<a href="html/libxml-parser.html#XML_WITH_C14N">XML_WITH_C14N</a><br />
+<a href="html/libxml-parser.html#XML_WITH_CATALOG">XML_WITH_CATALOG</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG">XML_WITH_DEBUG</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG_MEM">XML_WITH_DEBUG_MEM</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG_RUN">XML_WITH_DEBUG_RUN</a><br />
+<a href="html/libxml-parser.html#XML_WITH_EXPR">XML_WITH_EXPR</a><br />
+<a href="html/libxml-parser.html#XML_WITH_FTP">XML_WITH_FTP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_HTML">XML_WITH_HTML</a><br />
+<a href="html/libxml-parser.html#XML_WITH_HTTP">XML_WITH_HTTP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_ICONV">XML_WITH_ICONV</a><br />
+<a href="html/libxml-parser.html#XML_WITH_ISO8859X">XML_WITH_ISO8859X</a><br />
+<a href="html/libxml-parser.html#XML_WITH_LEGACY">XML_WITH_LEGACY</a><br />
+<a href="html/libxml-parser.html#XML_WITH_MODULES">XML_WITH_MODULES</a><br />
+<a href="html/libxml-parser.html#XML_WITH_NONE">XML_WITH_NONE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_OUTPUT">XML_WITH_OUTPUT</a><br />
+<a href="html/libxml-parser.html#XML_WITH_PATTERN">XML_WITH_PATTERN</a><br />
+<a href="html/libxml-parser.html#XML_WITH_PUSH">XML_WITH_PUSH</a><br />
+<a href="html/libxml-parser.html#XML_WITH_READER">XML_WITH_READER</a><br />
+<a href="html/libxml-parser.html#XML_WITH_REGEXP">XML_WITH_REGEXP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SAX1">XML_WITH_SAX1</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SCHEMAS">XML_WITH_SCHEMAS</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SCHEMATRON">XML_WITH_SCHEMATRON</a><br />
+<a href="html/libxml-parser.html#XML_WITH_THREAD">XML_WITH_THREAD</a><br />
+<a href="html/libxml-parser.html#XML_WITH_TREE">XML_WITH_TREE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_UNICODE">XML_WITH_UNICODE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_VALID">XML_WITH_VALID</a><br />
+<a href="html/libxml-parser.html#XML_WITH_WRITER">XML_WITH_WRITER</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XINCLUDE">XML_WITH_XINCLUDE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XPATH">XML_WITH_XPATH</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XPTR">XML_WITH_XPTR</a><br />
 <a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br />
 <a href="html/libxml-parser.html#_xmlParserInput">_xmlParserInput</a><br />
 <a href="html/libxml-parser.html#_xmlParserNodeInfo">_xmlParserNodeInfo</a><br />
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index d0fe11df..6da6ed59 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -413,37 +413,6 @@ A:link, A:visited, A:active { text-decoration: underline }
 <a href="html/libxml-entities.html#XML_EXTERNAL_GENERAL_PARSED_ENTITY">XML_EXTERNAL_GENERAL_PARSED_ENTITY</a><br />
 <a href="html/libxml-entities.html#XML_EXTERNAL_GENERAL_UNPARSED_ENTITY">XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</a><br />
 <a href="html/libxml-entities.html#XML_EXTERNAL_PARAMETER_ENTITY">XML_EXTERNAL_PARAMETER_ENTITY</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_AUTOMATA">XML_FEATURE_AUTOMATA</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_C14N">XML_FEATURE_C14N</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_CATALOG">XML_FEATURE_CATALOG</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG">XML_FEATURE_DEBUG</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG_MEM">XML_FEATURE_DEBUG_MEM</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_DEBUG_RUN">XML_FEATURE_DEBUG_RUN</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_EXPR">XML_FEATURE_EXPR</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_FTP">XML_FEATURE_FTP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_HTML">XML_FEATURE_HTML</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_HTTP">XML_FEATURE_HTTP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_ICONV">XML_FEATURE_ICONV</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_ISO8859X">XML_FEATURE_ISO8859X</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_LEGACY">XML_FEATURE_LEGACY</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_MODULES">XML_FEATURE_MODULES</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_NONE">XML_FEATURE_NONE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_OUTPUT">XML_FEATURE_OUTPUT</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_PATTERN">XML_FEATURE_PATTERN</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_PUSH">XML_FEATURE_PUSH</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_READER">XML_FEATURE_READER</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_REGEXP">XML_FEATURE_REGEXP</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SAX1">XML_FEATURE_SAX1</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SCHEMAS">XML_FEATURE_SCHEMAS</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_SCHEMATRON">XML_FEATURE_SCHEMATRON</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_THREAD">XML_FEATURE_THREAD</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_TREE">XML_FEATURE_TREE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_UNICODE">XML_FEATURE_UNICODE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_VALID">XML_FEATURE_VALID</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_WRITER">XML_FEATURE_WRITER</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XINCLUDE">XML_FEATURE_XINCLUDE</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XPATH">XML_FEATURE_XPATH</a><br />
-<a href="html/libxml-parser.html#XML_FEATURE_XPTR">XML_FEATURE_XPTR</a><br />
 <a href="html/libxml-xmlerror.html#XML_FROM_C14N">XML_FROM_C14N</a><br />
 <a href="html/libxml-xmlerror.html#XML_FROM_CATALOG">XML_FROM_CATALOG</a><br />
 <a href="html/libxml-xmlerror.html#XML_FROM_CHECK">XML_FROM_CHECK</a><br />
@@ -1301,6 +1270,37 @@ A:link, A:visited, A:active { text-decoration: underline }
 <a href="html/libxml-xmlerror.html#XML_WAR_SPACE_VALUE">XML_WAR_SPACE_VALUE</a><br />
 <a href="html/libxml-xmlerror.html#XML_WAR_UNDECLARED_ENTITY">XML_WAR_UNDECLARED_ENTITY</a><br />
 <a href="html/libxml-xmlerror.html#XML_WAR_UNKNOWN_VERSION">XML_WAR_UNKNOWN_VERSION</a><br />
+<a href="html/libxml-parser.html#XML_WITH_AUTOMATA">XML_WITH_AUTOMATA</a><br />
+<a href="html/libxml-parser.html#XML_WITH_C14N">XML_WITH_C14N</a><br />
+<a href="html/libxml-parser.html#XML_WITH_CATALOG">XML_WITH_CATALOG</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG">XML_WITH_DEBUG</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG_MEM">XML_WITH_DEBUG_MEM</a><br />
+<a href="html/libxml-parser.html#XML_WITH_DEBUG_RUN">XML_WITH_DEBUG_RUN</a><br />
+<a href="html/libxml-parser.html#XML_WITH_EXPR">XML_WITH_EXPR</a><br />
+<a href="html/libxml-parser.html#XML_WITH_FTP">XML_WITH_FTP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_HTML">XML_WITH_HTML</a><br />
+<a href="html/libxml-parser.html#XML_WITH_HTTP">XML_WITH_HTTP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_ICONV">XML_WITH_ICONV</a><br />
+<a href="html/libxml-parser.html#XML_WITH_ISO8859X">XML_WITH_ISO8859X</a><br />
+<a href="html/libxml-parser.html#XML_WITH_LEGACY">XML_WITH_LEGACY</a><br />
+<a href="html/libxml-parser.html#XML_WITH_MODULES">XML_WITH_MODULES</a><br />
+<a href="html/libxml-parser.html#XML_WITH_NONE">XML_WITH_NONE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_OUTPUT">XML_WITH_OUTPUT</a><br />
+<a href="html/libxml-parser.html#XML_WITH_PATTERN">XML_WITH_PATTERN</a><br />
+<a href="html/libxml-parser.html#XML_WITH_PUSH">XML_WITH_PUSH</a><br />
+<a href="html/libxml-parser.html#XML_WITH_READER">XML_WITH_READER</a><br />
+<a href="html/libxml-parser.html#XML_WITH_REGEXP">XML_WITH_REGEXP</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SAX1">XML_WITH_SAX1</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SCHEMAS">XML_WITH_SCHEMAS</a><br />
+<a href="html/libxml-parser.html#XML_WITH_SCHEMATRON">XML_WITH_SCHEMATRON</a><br />
+<a href="html/libxml-parser.html#XML_WITH_THREAD">XML_WITH_THREAD</a><br />
+<a href="html/libxml-parser.html#XML_WITH_TREE">XML_WITH_TREE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_UNICODE">XML_WITH_UNICODE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_VALID">XML_WITH_VALID</a><br />
+<a href="html/libxml-parser.html#XML_WITH_WRITER">XML_WITH_WRITER</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XINCLUDE">XML_WITH_XINCLUDE</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XPATH">XML_WITH_XPATH</a><br />
+<a href="html/libxml-parser.html#XML_WITH_XPTR">XML_WITH_XPTR</a><br />
 <a href="html/libxml-xmlerror.html#XML_XINCLUDE_BUILD_FAILED">XML_XINCLUDE_BUILD_FAILED</a><br />
 <a href="html/libxml-xmlerror.html#XML_XINCLUDE_DEPRECATED_NS">XML_XINCLUDE_DEPRECATED_NS</a><br />
 <a href="html/libxml-tree.html#XML_XINCLUDE_END">XML_XINCLUDE_END</a><br />
diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb5bc656..73326590 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS=examples devhelp
+SUBDIRS=devhelp examples
 
 # The top-level SGML file.
 DOC_MAIN_XML_FILE=gnome-xml.xml
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index c1448aa6..777b8195 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -193,37 +193,37 @@ void	<a href="#xmlParserInputDeallocate">xmlParserInputDeallocate</a>	(<a href="
 <h3><a name="XML_SAX2_MAGIC" id="XML_SAX2_MAGIC"></a>Macro: XML_SAX2_MAGIC</h3><pre>#define XML_SAX2_MAGIC</pre><p>Special constant found in SAX2 blocks initialized fields</p>
 <h3><a name="XML_SKIP_IDS" id="XML_SKIP_IDS"></a>Macro: XML_SKIP_IDS</h3><pre>#define XML_SKIP_IDS</pre><p>Bit in the loadsubset context field to tell to not do ID/REFs registration. Used to initialize <a href="libxml-globals.html#xmlLoadExtDtdDefaultValue">xmlLoadExtDtdDefaultValue</a> in some special cases.</p>
 <h3>Enum <a name="xmlFeature" id="xmlFeature">xmlFeature</a></h3><pre class="programlisting">Enum xmlFeature {
-    <a name="XML_FEATURE_THREAD" id="XML_FEATURE_THREAD">XML_FEATURE_THREAD</a> = 1
-    <a name="XML_FEATURE_TREE" id="XML_FEATURE_TREE">XML_FEATURE_TREE</a> = 2
-    <a name="XML_FEATURE_OUTPUT" id="XML_FEATURE_OUTPUT">XML_FEATURE_OUTPUT</a> = 3
-    <a name="XML_FEATURE_PUSH" id="XML_FEATURE_PUSH">XML_FEATURE_PUSH</a> = 4
-    <a name="XML_FEATURE_READER" id="XML_FEATURE_READER">XML_FEATURE_READER</a> = 5
-    <a name="XML_FEATURE_PATTERN" id="XML_FEATURE_PATTERN">XML_FEATURE_PATTERN</a> = 6
-    <a name="XML_FEATURE_WRITER" id="XML_FEATURE_WRITER">XML_FEATURE_WRITER</a> = 7
-    <a name="XML_FEATURE_SAX1" id="XML_FEATURE_SAX1">XML_FEATURE_SAX1</a> = 8
-    <a name="XML_FEATURE_FTP" id="XML_FEATURE_FTP">XML_FEATURE_FTP</a> = 9
-    <a name="XML_FEATURE_HTTP" id="XML_FEATURE_HTTP">XML_FEATURE_HTTP</a> = 10
-    <a name="XML_FEATURE_VALID" id="XML_FEATURE_VALID">XML_FEATURE_VALID</a> = 11
-    <a name="XML_FEATURE_HTML" id="XML_FEATURE_HTML">XML_FEATURE_HTML</a> = 12
-    <a name="XML_FEATURE_LEGACY" id="XML_FEATURE_LEGACY">XML_FEATURE_LEGACY</a> = 13
-    <a name="XML_FEATURE_C14N" id="XML_FEATURE_C14N">XML_FEATURE_C14N</a> = 14
-    <a name="XML_FEATURE_CATALOG" id="XML_FEATURE_CATALOG">XML_FEATURE_CATALOG</a> = 15
-    <a name="XML_FEATURE_XPATH" id="XML_FEATURE_XPATH">XML_FEATURE_XPATH</a> = 16
-    <a name="XML_FEATURE_XPTR" id="XML_FEATURE_XPTR">XML_FEATURE_XPTR</a> = 17
-    <a name="XML_FEATURE_XINCLUDE" id="XML_FEATURE_XINCLUDE">XML_FEATURE_XINCLUDE</a> = 18
-    <a name="XML_FEATURE_ICONV" id="XML_FEATURE_ICONV">XML_FEATURE_ICONV</a> = 19
-    <a name="XML_FEATURE_ISO8859X" id="XML_FEATURE_ISO8859X">XML_FEATURE_ISO8859X</a> = 20
-    <a name="XML_FEATURE_UNICODE" id="XML_FEATURE_UNICODE">XML_FEATURE_UNICODE</a> = 21
-    <a name="XML_FEATURE_REGEXP" id="XML_FEATURE_REGEXP">XML_FEATURE_REGEXP</a> = 22
-    <a name="XML_FEATURE_AUTOMATA" id="XML_FEATURE_AUTOMATA">XML_FEATURE_AUTOMATA</a> = 23
-    <a name="XML_FEATURE_EXPR" id="XML_FEATURE_EXPR">XML_FEATURE_EXPR</a> = 24
-    <a name="XML_FEATURE_SCHEMAS" id="XML_FEATURE_SCHEMAS">XML_FEATURE_SCHEMAS</a> = 25
-    <a name="XML_FEATURE_SCHEMATRON" id="XML_FEATURE_SCHEMATRON">XML_FEATURE_SCHEMATRON</a> = 26
-    <a name="XML_FEATURE_MODULES" id="XML_FEATURE_MODULES">XML_FEATURE_MODULES</a> = 27
-    <a name="XML_FEATURE_DEBUG" id="XML_FEATURE_DEBUG">XML_FEATURE_DEBUG</a> = 28
-    <a name="XML_FEATURE_DEBUG_MEM" id="XML_FEATURE_DEBUG_MEM">XML_FEATURE_DEBUG_MEM</a> = 29
-    <a name="XML_FEATURE_DEBUG_RUN" id="XML_FEATURE_DEBUG_RUN">XML_FEATURE_DEBUG_RUN</a> = 30
-    <a name="XML_FEATURE_NONE" id="XML_FEATURE_NONE">XML_FEATURE_NONE</a> = 99999 : just to be sure of allocation size
+    <a name="XML_WITH_THREAD" id="XML_WITH_THREAD">XML_WITH_THREAD</a> = 1
+    <a name="XML_WITH_TREE" id="XML_WITH_TREE">XML_WITH_TREE</a> = 2
+    <a name="XML_WITH_OUTPUT" id="XML_WITH_OUTPUT">XML_WITH_OUTPUT</a> = 3
+    <a name="XML_WITH_PUSH" id="XML_WITH_PUSH">XML_WITH_PUSH</a> = 4
+    <a name="XML_WITH_READER" id="XML_WITH_READER">XML_WITH_READER</a> = 5
+    <a name="XML_WITH_PATTERN" id="XML_WITH_PATTERN">XML_WITH_PATTERN</a> = 6
+    <a name="XML_WITH_WRITER" id="XML_WITH_WRITER">XML_WITH_WRITER</a> = 7
+    <a name="XML_WITH_SAX1" id="XML_WITH_SAX1">XML_WITH_SAX1</a> = 8
+    <a name="XML_WITH_FTP" id="XML_WITH_FTP">XML_WITH_FTP</a> = 9
+    <a name="XML_WITH_HTTP" id="XML_WITH_HTTP">XML_WITH_HTTP</a> = 10
+    <a name="XML_WITH_VALID" id="XML_WITH_VALID">XML_WITH_VALID</a> = 11
+    <a name="XML_WITH_HTML" id="XML_WITH_HTML">XML_WITH_HTML</a> = 12
+    <a name="XML_WITH_LEGACY" id="XML_WITH_LEGACY">XML_WITH_LEGACY</a> = 13
+    <a name="XML_WITH_C14N" id="XML_WITH_C14N">XML_WITH_C14N</a> = 14
+    <a name="XML_WITH_CATALOG" id="XML_WITH_CATALOG">XML_WITH_CATALOG</a> = 15
+    <a name="XML_WITH_XPATH" id="XML_WITH_XPATH">XML_WITH_XPATH</a> = 16
+    <a name="XML_WITH_XPTR" id="XML_WITH_XPTR">XML_WITH_XPTR</a> = 17
+    <a name="XML_WITH_XINCLUDE" id="XML_WITH_XINCLUDE">XML_WITH_XINCLUDE</a> = 18
+    <a name="XML_WITH_ICONV" id="XML_WITH_ICONV">XML_WITH_ICONV</a> = 19
+    <a name="XML_WITH_ISO8859X" id="XML_WITH_ISO8859X">XML_WITH_ISO8859X</a> = 20
+    <a name="XML_WITH_UNICODE" id="XML_WITH_UNICODE">XML_WITH_UNICODE</a> = 21
+    <a name="XML_WITH_REGEXP" id="XML_WITH_REGEXP">XML_WITH_REGEXP</a> = 22
+    <a name="XML_WITH_AUTOMATA" id="XML_WITH_AUTOMATA">XML_WITH_AUTOMATA</a> = 23
+    <a name="XML_WITH_EXPR" id="XML_WITH_EXPR">XML_WITH_EXPR</a> = 24
+    <a name="XML_WITH_SCHEMAS" id="XML_WITH_SCHEMAS">XML_WITH_SCHEMAS</a> = 25
+    <a name="XML_WITH_SCHEMATRON" id="XML_WITH_SCHEMATRON">XML_WITH_SCHEMATRON</a> = 26
+    <a name="XML_WITH_MODULES" id="XML_WITH_MODULES">XML_WITH_MODULES</a> = 27
+    <a name="XML_WITH_DEBUG" id="XML_WITH_DEBUG">XML_WITH_DEBUG</a> = 28
+    <a name="XML_WITH_DEBUG_MEM" id="XML_WITH_DEBUG_MEM">XML_WITH_DEBUG_MEM</a> = 29
+    <a name="XML_WITH_DEBUG_RUN" id="XML_WITH_DEBUG_RUN">XML_WITH_DEBUG_RUN</a> = 30
+    <a name="XML_WITH_NONE" id="XML_WITH_NONE">XML_WITH_NONE</a> = 99999 : just to be sure of allocation size
 }
 </pre><h3>Enum <a name="xmlParserInputState" id="xmlParserInputState">xmlParserInputState</a></h3><pre class="programlisting">Enum xmlParserInputState {
     <a name="XML_PARSER_EOF" id="XML_PARSER_EOF">XML_PARSER_EOF</a> = -1 : nothing is to be parsed
diff --git a/doc/html/libxml-xmlautomata.html b/doc/html/libxml-xmlautomata.html
index 25ffb002..3abcdf1e 100644
--- a/doc/html/libxml-xmlautomata.html
+++ b/doc/html/libxml-xmlautomata.html
@@ -38,9 +38,13 @@ The content of this structure is not made public by the API.
 <h2>Description</h2>
 <h3><a name="xmlAutomata" id="xmlAutomata">Structure xmlAutomata</a></h3><pre class="programlisting">Structure xmlAutomata<br />struct _xmlAutomata {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="xmlAutomataState" id="xmlAutomataState">Structure xmlAutomataState</a></h3><pre class="programlisting">Structure xmlAutomataState<br />struct _xmlAutomataState {
+}</pre>
+      A libxml automata description, It can be compiled into a regexp
+    <h3><a name="xmlAutomataState" id="xmlAutomataState">Structure xmlAutomataState</a></h3><pre class="programlisting">Structure xmlAutomataState<br />struct _xmlAutomataState {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="xmlAutomataCompile" id="xmlAutomataCompile"></a>Function: xmlAutomataCompile</h3><pre class="programlisting"><a href="libxml-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	xmlAutomataCompile	(<a href="libxml-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am)<br />
+}</pre>
+      A state int the automata description,
+    <h3><a name="xmlAutomataCompile" id="xmlAutomataCompile"></a>Function: xmlAutomataCompile</h3><pre class="programlisting"><a href="libxml-xmlregexp.html#xmlRegexpPtr">xmlRegexpPtr</a>	xmlAutomataCompile	(<a href="libxml-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am)<br />
 </pre><p>Compile the automata into a Reg Exp ready for being executed. The automata should be free after this point.</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>am</tt></i>:</span></td><td>an automata</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the compiled regexp or NULL in case of error</td></tr></tbody></table></div><h3><a name="xmlAutomataGetInitState" id="xmlAutomataGetInitState"></a>Function: xmlAutomataGetInitState</h3><pre class="programlisting"><a href="libxml-xmlautomata.html#xmlAutomataStatePtr">xmlAutomataStatePtr</a>	xmlAutomataGetInitState	(<a href="libxml-xmlautomata.html#xmlAutomataPtr">xmlAutomataPtr</a> am)<br />
 </pre><p>Initial state lookup</p>
diff --git a/doc/html/libxml-xmlmodule.html b/doc/html/libxml-xmlmodule.html
index 120f858a..d25b6049 100644
--- a/doc/html/libxml-xmlmodule.html
+++ b/doc/html/libxml-xmlmodule.html
@@ -25,7 +25,9 @@ The content of this structure is not made public by the API.
     <a name="XML_MODULE_LAZY" id="XML_MODULE_LAZY">XML_MODULE_LAZY</a> = 1 : lazy binding
     <a name="XML_MODULE_LOCAL" id="XML_MODULE_LOCAL">XML_MODULE_LOCAL</a> = 2 : local binding
 }
-</pre><h3><a name="xmlModuleClose" id="xmlModuleClose"></a>Function: xmlModuleClose</h3><pre class="programlisting">int	xmlModuleClose			(<a href="libxml-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module)<br />
+</pre>
+      A handle to a dynamically loaded module
+    <h3><a name="xmlModuleClose" id="xmlModuleClose"></a>Function: xmlModuleClose</h3><pre class="programlisting">int	xmlModuleClose			(<a href="libxml-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module)<br />
 </pre><p>The close operations unload the associated module and free the data associated to the module.</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>module</tt></i>:</span></td><td>the module handle</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of argument error and -2 if the module could not be closed/unloaded.</td></tr></tbody></table></div><h3><a name="xmlModuleFree" id="xmlModuleFree"></a>Function: xmlModuleFree</h3><pre class="programlisting">int	xmlModuleFree			(<a href="libxml-xmlmodule.html#xmlModulePtr">xmlModulePtr</a> module)<br />
 </pre><p>The free operations free the data associated to the module but does not unload the associated shared library which may still be in use.</p>
diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html
index 3bd3640c..6036ccb8 100644
--- a/doc/html/libxml-xmlreader.html
+++ b/doc/html/libxml-xmlreader.html
@@ -147,7 +147,9 @@ The content of this structure is not made public by the API.
     <a name="XML_TEXTREADER_MODE_CLOSED" id="XML_TEXTREADER_MODE_CLOSED">XML_TEXTREADER_MODE_CLOSED</a> = 4
     <a name="XML_TEXTREADER_MODE_READING" id="XML_TEXTREADER_MODE_READING">XML_TEXTREADER_MODE_READING</a> = 5
 }
-</pre><h3><a name="xmlFreeTextReader" id="xmlFreeTextReader"></a>Function: xmlFreeTextReader</h3><pre class="programlisting">void	xmlFreeTextReader		(<a href="libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br />
+</pre>
+      Pointer to an xmlReader context.
+    <h3><a name="xmlFreeTextReader" id="xmlFreeTextReader"></a>Function: xmlFreeTextReader</h3><pre class="programlisting">void	xmlFreeTextReader		(<a href="libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br />
 </pre><p>Deallocate all the resources associated to the reader</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a></td></tr></tbody></table></div><h3><a name="xmlNewTextReader" id="xmlNewTextReader"></a>Function: xmlNewTextReader</h3><pre class="programlisting"><a href="libxml-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a>	xmlNewTextReader	(<a href="libxml-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br />						 const char * URI)<br />
 </pre><p>Create an <a href="libxml-xmlreader.html#xmlTextReader">xmlTextReader</a> structure fed with @input</p>
diff --git a/doc/html/libxml-xmlregexp.html b/doc/html/libxml-xmlregexp.html
index 761e1055..b507f347 100644
--- a/doc/html/libxml-xmlregexp.html
+++ b/doc/html/libxml-xmlregexp.html
@@ -71,9 +71,13 @@ The content of this structure is not made public by the API.
 }
 </pre><h3><a name="xmlRegExecCtxt" id="xmlRegExecCtxt">Structure xmlRegExecCtxt</a></h3><pre class="programlisting">Structure xmlRegExecCtxt<br />struct _xmlRegExecCtxt {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="xmlRegexp" id="xmlRegexp">Structure xmlRegexp</a></h3><pre class="programlisting">Structure xmlRegexp<br />struct _xmlRegexp {
+}</pre>
+      A libxml progressive regular expression evaluation context
+    <h3><a name="xmlRegexp" id="xmlRegexp">Structure xmlRegexp</a></h3><pre class="programlisting">Structure xmlRegexp<br />struct _xmlRegexp {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="xmlExpCtxtNbCons" id="xmlExpCtxtNbCons"></a>Function: xmlExpCtxtNbCons</h3><pre class="programlisting">int	xmlExpCtxtNbCons		(<a href="libxml-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt)<br />
+}</pre>
+      A libxml regular expression, they can actually be far more complex thank the POSIX regex expressions.
+    <h3><a name="xmlExpCtxtNbCons" id="xmlExpCtxtNbCons"></a>Function: xmlExpCtxtNbCons</h3><pre class="programlisting">int	xmlExpCtxtNbCons		(<a href="libxml-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt)<br />
 </pre><p>Debugging facility provides the number of allocated nodes over lifetime</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>an expression context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of nodes ever allocated or -1 in case of error</td></tr></tbody></table></div><h3><a name="xmlExpCtxtNbNodes" id="xmlExpCtxtNbNodes"></a>Function: xmlExpCtxtNbNodes</h3><pre class="programlisting">int	xmlExpCtxtNbNodes		(<a href="libxml-xmlregexp.html#xmlExpCtxtPtr">xmlExpCtxtPtr</a> ctxt)<br />
 </pre><p>Debugging facility provides the number of allocated nodes at a that point</p>
diff --git a/doc/html/libxml-xmlstring.html b/doc/html/libxml-xmlstring.html
index 7dde6372..bbcc85f9 100644
--- a/doc/html/libxml-xmlstring.html
+++ b/doc/html/libxml-xmlstring.html
@@ -43,7 +43,9 @@ A:link, A:visited, A:active { text-decoration: underline }
 <pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> *	<a href="#xmlUTF8Strsub">xmlUTF8Strsub</a>		(const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * utf, <br />					 int start, <br />					 int len)</pre>
 <h2>Description</h2>
 <h3><a name="BAD_CAST" id="BAD_CAST"></a>Macro: BAD_CAST</h3><pre>#define BAD_CAST</pre><p>Macro to cast a string to an <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * when one know its safe.</p>
-<h3><a name="xmlCharStrdup" id="xmlCharStrdup"></a>Function: xmlCharStrdup</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> *	xmlCharStrdup		(const char * cur)<br />
+
+      This is a basic byte in an UTF-8 encoded string. It's unsigned allowing to pinpoint case where char * are assigned to xmlChar * (possibly making serialization back impossible).
+    <h3><a name="xmlCharStrdup" id="xmlCharStrdup"></a>Function: xmlCharStrdup</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> *	xmlCharStrdup		(const char * cur)<br />
 </pre><p>a strdup for char's to xmlChar's</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>cur</tt></i>:</span></td><td>the input char *</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * or NULL</td></tr></tbody></table></div><h3><a name="xmlCharStrndup" id="xmlCharStrndup"></a>Function: xmlCharStrndup</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> *	xmlCharStrndup		(const char * cur, <br />					 int len)<br />
 </pre><p>a strndup for char's to xmlChar's</p>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index da218752..d0a937d8 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -663,78 +663,78 @@
      <exports symbol='XML_SAX2_MAGIC' type='macro'/>
      <exports symbol='XML_DETECT_IDS' type='macro'/>
      <exports symbol='XML_DEFAULT_VERSION' type='macro'/>
-     <exports symbol='XML_FEATURE_SCHEMAS' type='enum'/>
-     <exports symbol='XML_FEATURE_TREE' type='enum'/>
+     <exports symbol='XML_WITH_SCHEMATRON' type='enum'/>
+     <exports symbol='XML_PARSER_ENTITY_DECL' type='enum'/>
      <exports symbol='XML_PARSER_CONTENT' type='enum'/>
-     <exports symbol='XML_FEATURE_XINCLUDE' type='enum'/>
      <exports symbol='XML_PARSE_NOBLANKS' type='enum'/>
-     <exports symbol='XML_FEATURE_OUTPUT' type='enum'/>
-     <exports symbol='XML_FEATURE_PUSH' type='enum'/>
-     <exports symbol='XML_FEATURE_FTP' type='enum'/>
+     <exports symbol='XML_WITH_PATTERN' type='enum'/>
+     <exports symbol='XML_PARSE_NODICT' type='enum'/>
+     <exports symbol='XML_PARSER_SYSTEM_LITERAL' type='enum'/>
+     <exports symbol='XML_WITH_REGEXP' type='enum'/>
      <exports symbol='XML_PARSER_PI' type='enum'/>
-     <exports symbol='XML_FEATURE_EXPR' type='enum'/>
-     <exports symbol='XML_FEATURE_UNICODE' type='enum'/>
-     <exports symbol='XML_FEATURE_WRITER' type='enum'/>
-     <exports symbol='XML_PARSER_ENTITY_DECL' type='enum'/>
+     <exports symbol='XML_WITH_FTP' type='enum'/>
+     <exports symbol='XML_WITH_XPATH' type='enum'/>
+     <exports symbol='XML_WITH_HTML' type='enum'/>
+     <exports symbol='XML_WITH_WRITER' type='enum'/>
+     <exports symbol='XML_WITH_C14N' type='enum'/>
+     <exports symbol='XML_PARSE_PUSH_DOM' type='enum'/>
      <exports symbol='XML_PARSER_PROLOG' type='enum'/>
-     <exports symbol='XML_PARSER_MISC' type='enum'/>
-     <exports symbol='XML_FEATURE_C14N' type='enum'/>
+     <exports symbol='XML_PARSE_NONET' type='enum'/>
+     <exports symbol='XML_WITH_HTTP' type='enum'/>
+     <exports symbol='XML_PARSER_EPILOG' type='enum'/>
      <exports symbol='XML_PARSER_END_TAG' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG' type='enum'/>
      <exports symbol='XML_PARSE_DTDVALID' type='enum'/>
-     <exports symbol='XML_FEATURE_DEBUG_MEM' type='enum'/>
-     <exports symbol='XML_PARSE_READER' type='enum'/>
-     <exports symbol='XML_FEATURE_THREAD' type='enum'/>
-     <exports symbol='XML_FEATURE_SAX1' type='enum'/>
+     <exports symbol='XML_PARSE_DOM' type='enum'/>
+     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE' type='enum'/>
      <exports symbol='XML_PARSE_PUSH_SAX' type='enum'/>
+     <exports symbol='XML_WITH_TREE' type='enum'/>
      <exports symbol='XML_PARSE_RECOVER' type='enum'/>
-     <exports symbol='XML_FEATURE_ICONV' type='enum'/>
-     <exports symbol='XML_FEATURE_READER' type='enum'/>
-     <exports symbol='XML_PARSE_NONET' type='enum'/>
+     <exports symbol='XML_WITH_SCHEMAS' type='enum'/>
      <exports symbol='XML_PARSE_PEDANTIC' type='enum'/>
-     <exports symbol='XML_FEATURE_AUTOMATA' type='enum'/>
      <exports symbol='XML_PARSER_EOF' type='enum'/>
-     <exports symbol='XML_FEATURE_LEGACY' type='enum'/>
      <exports symbol='XML_PARSER_CDATA_SECTION' type='enum'/>
-     <exports symbol='XML_FEATURE_REGEXP' type='enum'/>
-     <exports symbol='XML_PARSE_NOENT' type='enum'/>
+     <exports symbol='XML_WITH_LEGACY' type='enum'/>
      <exports symbol='XML_PARSE_XINCLUDE' type='enum'/>
-     <exports symbol='XML_PARSE_NOCDATA' type='enum'/>
-     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE' type='enum'/>
-     <exports symbol='XML_PARSE_NODICT' type='enum'/>
-     <exports symbol='XML_FEATURE_DEBUG' type='enum'/>
+     <exports symbol='XML_PARSE_NOXINCNODE' type='enum'/>
+     <exports symbol='XML_WITH_NONE' type='enum'/>
+     <exports symbol='XML_WITH_OUTPUT' type='enum'/>
+     <exports symbol='XML_WITH_XINCLUDE' type='enum'/>
+     <exports symbol='XML_WITH_PUSH' type='enum'/>
+     <exports symbol='XML_PARSE_READER' type='enum'/>
+     <exports symbol='XML_WITH_THREAD' type='enum'/>
      <exports symbol='XML_PARSE_SAX' type='enum'/>
-     <exports symbol='XML_FEATURE_PATTERN' type='enum'/>
+     <exports symbol='XML_PARSE_NOENT' type='enum'/>
      <exports symbol='XML_PARSER_ENTITY_VALUE' type='enum'/>
      <exports symbol='XML_PARSE_DTDLOAD' type='enum'/>
-     <exports symbol='XML_FEATURE_HTML' type='enum'/>
      <exports symbol='XML_PARSE_DTDATTR' type='enum'/>
      <exports symbol='XML_PARSE_NOWARNING' type='enum'/>
-     <exports symbol='XML_PARSER_EPILOG' type='enum'/>
+     <exports symbol='XML_WITH_VALID' type='enum'/>
      <exports symbol='XML_PARSE_NOERROR' type='enum'/>
-     <exports symbol='XML_PARSE_DOM' type='enum'/>
-     <exports symbol='XML_PARSE_PUSH_DOM' type='enum'/>
-     <exports symbol='XML_FEATURE_CATALOG' type='enum'/>
-     <exports symbol='XML_FEATURE_MODULES' type='enum'/>
-     <exports symbol='XML_FEATURE_NONE' type='enum'/>
+     <exports symbol='XML_WITH_ISO8859X' type='enum'/>
+     <exports symbol='XML_WITH_EXPR' type='enum'/>
      <exports symbol='XML_PARSE_NSCLEAN' type='enum'/>
-     <exports symbol='XML_FEATURE_XPATH' type='enum'/>
+     <exports symbol='XML_WITH_UNICODE' type='enum'/>
+     <exports symbol='XML_WITH_CATALOG' type='enum'/>
+     <exports symbol='XML_WITH_MODULES' type='enum'/>
+     <exports symbol='XML_WITH_XPTR' type='enum'/>
+     <exports symbol='XML_PARSE_NOCDATA' type='enum'/>
      <exports symbol='XML_PARSE_COMPACT' type='enum'/>
      <exports symbol='XML_PARSE_SAX1' type='enum'/>
-     <exports symbol='XML_PARSE_NOXINCNODE' type='enum'/>
+     <exports symbol='XML_WITH_READER' type='enum'/>
      <exports symbol='XML_PARSER_DTD' type='enum'/>
-     <exports symbol='XML_FEATURE_SCHEMATRON' type='enum'/>
+     <exports symbol='XML_PARSER_MISC' type='enum'/>
      <exports symbol='XML_PARSER_START' type='enum'/>
-     <exports symbol='XML_PARSER_SYSTEM_LITERAL' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG_MEM' type='enum'/>
      <exports symbol='XML_PARSE_UNKNOWN' type='enum'/>
      <exports symbol='XML_PARSER_START_TAG' type='enum'/>
-     <exports symbol='XML_FEATURE_ISO8859X' type='enum'/>
      <exports symbol='XML_PARSER_IGNORE' type='enum'/>
      <exports symbol='XML_PARSER_COMMENT' type='enum'/>
      <exports symbol='XML_PARSER_PUBLIC_LITERAL' type='enum'/>
-     <exports symbol='XML_FEATURE_DEBUG_RUN' type='enum'/>
-     <exports symbol='XML_FEATURE_HTTP' type='enum'/>
-     <exports symbol='XML_FEATURE_XPTR' type='enum'/>
-     <exports symbol='XML_FEATURE_VALID' type='enum'/>
+     <exports symbol='XML_WITH_ICONV' type='enum'/>
+     <exports symbol='XML_WITH_AUTOMATA' type='enum'/>
+     <exports symbol='XML_WITH_DEBUG_RUN' type='enum'/>
+     <exports symbol='XML_WITH_SAX1' type='enum'/>
      <exports symbol='xmlParserNodeInfoSeqPtr' type='typedef'/>
      <exports symbol='xmlSAXHandlerV1' type='typedef'/>
      <exports symbol='xmlParserInputState' type='typedef'/>
@@ -4783,37 +4783,6 @@
     <enum name='XML_EXTERNAL_GENERAL_PARSED_ENTITY' file='entities' value='2' type='xmlEntityType'/>
     <enum name='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY' file='entities' value='3' type='xmlEntityType'/>
     <enum name='XML_EXTERNAL_PARAMETER_ENTITY' file='entities' value='5' type='xmlEntityType'/>
-    <enum name='XML_FEATURE_AUTOMATA' file='parser' value='23' type='xmlFeature'/>
-    <enum name='XML_FEATURE_C14N' file='parser' value='14' type='xmlFeature'/>
-    <enum name='XML_FEATURE_CATALOG' file='parser' value='15' type='xmlFeature'/>
-    <enum name='XML_FEATURE_DEBUG' file='parser' value='28' type='xmlFeature'/>
-    <enum name='XML_FEATURE_DEBUG_MEM' file='parser' value='29' type='xmlFeature'/>
-    <enum name='XML_FEATURE_DEBUG_RUN' file='parser' value='30' type='xmlFeature'/>
-    <enum name='XML_FEATURE_EXPR' file='parser' value='24' type='xmlFeature'/>
-    <enum name='XML_FEATURE_FTP' file='parser' value='9' type='xmlFeature'/>
-    <enum name='XML_FEATURE_HTML' file='parser' value='12' type='xmlFeature'/>
-    <enum name='XML_FEATURE_HTTP' file='parser' value='10' type='xmlFeature'/>
-    <enum name='XML_FEATURE_ICONV' file='parser' value='19' type='xmlFeature'/>
-    <enum name='XML_FEATURE_ISO8859X' file='parser' value='20' type='xmlFeature'/>
-    <enum name='XML_FEATURE_LEGACY' file='parser' value='13' type='xmlFeature'/>
-    <enum name='XML_FEATURE_MODULES' file='parser' value='27' type='xmlFeature'/>
-    <enum name='XML_FEATURE_NONE' file='parser' value='99999' type='xmlFeature' info=' just to be sure of allocation size'/>
-    <enum name='XML_FEATURE_OUTPUT' file='parser' value='3' type='xmlFeature'/>
-    <enum name='XML_FEATURE_PATTERN' file='parser' value='6' type='xmlFeature'/>
-    <enum name='XML_FEATURE_PUSH' file='parser' value='4' type='xmlFeature'/>
-    <enum name='XML_FEATURE_READER' file='parser' value='5' type='xmlFeature'/>
-    <enum name='XML_FEATURE_REGEXP' file='parser' value='22' type='xmlFeature'/>
-    <enum name='XML_FEATURE_SAX1' file='parser' value='8' type='xmlFeature'/>
-    <enum name='XML_FEATURE_SCHEMAS' file='parser' value='25' type='xmlFeature'/>
-    <enum name='XML_FEATURE_SCHEMATRON' file='parser' value='26' type='xmlFeature'/>
-    <enum name='XML_FEATURE_THREAD' file='parser' value='1' type='xmlFeature'/>
-    <enum name='XML_FEATURE_TREE' file='parser' value='2' type='xmlFeature'/>
-    <enum name='XML_FEATURE_UNICODE' file='parser' value='21' type='xmlFeature'/>
-    <enum name='XML_FEATURE_VALID' file='parser' value='11' type='xmlFeature'/>
-    <enum name='XML_FEATURE_WRITER' file='parser' value='7' type='xmlFeature'/>
-    <enum name='XML_FEATURE_XINCLUDE' file='parser' value='18' type='xmlFeature'/>
-    <enum name='XML_FEATURE_XPATH' file='parser' value='16' type='xmlFeature'/>
-    <enum name='XML_FEATURE_XPTR' file='parser' value='17' type='xmlFeature'/>
     <enum name='XML_FROM_C14N' file='xmlerror' value='21' type='xmlErrorDomain' info='The Canonicalization module'/>
     <enum name='XML_FROM_CATALOG' file='xmlerror' value='20' type='xmlErrorDomain' info='The Catalog module'/>
     <enum name='XML_FROM_CHECK' file='xmlerror' value='24' type='xmlErrorDomain' info='The error checking module'/>
@@ -5585,6 +5554,37 @@
     <enum name='XML_WAR_SPACE_VALUE' file='xmlerror' value='102' type='xmlParserErrors' info='102'/>
     <enum name='XML_WAR_UNDECLARED_ENTITY' file='xmlerror' value='27' type='xmlParserErrors' info='27'/>
     <enum name='XML_WAR_UNKNOWN_VERSION' file='xmlerror' value='97' type='xmlParserErrors' info='97'/>
+    <enum name='XML_WITH_AUTOMATA' file='parser' value='23' type='xmlFeature'/>
+    <enum name='XML_WITH_C14N' file='parser' value='14' type='xmlFeature'/>
+    <enum name='XML_WITH_CATALOG' file='parser' value='15' type='xmlFeature'/>
+    <enum name='XML_WITH_DEBUG' file='parser' value='28' type='xmlFeature'/>
+    <enum name='XML_WITH_DEBUG_MEM' file='parser' value='29' type='xmlFeature'/>
+    <enum name='XML_WITH_DEBUG_RUN' file='parser' value='30' type='xmlFeature'/>
+    <enum name='XML_WITH_EXPR' file='parser' value='24' type='xmlFeature'/>
+    <enum name='XML_WITH_FTP' file='parser' value='9' type='xmlFeature'/>
+    <enum name='XML_WITH_HTML' file='parser' value='12' type='xmlFeature'/>
+    <enum name='XML_WITH_HTTP' file='parser' value='10' type='xmlFeature'/>
+    <enum name='XML_WITH_ICONV' file='parser' value='19' type='xmlFeature'/>
+    <enum name='XML_WITH_ISO8859X' file='parser' value='20' type='xmlFeature'/>
+    <enum name='XML_WITH_LEGACY' file='parser' value='13' type='xmlFeature'/>
+    <enum name='XML_WITH_MODULES' file='parser' value='27' type='xmlFeature'/>
+    <enum name='XML_WITH_NONE' file='parser' value='99999' type='xmlFeature' info=' just to be sure of allocation size'/>
+    <enum name='XML_WITH_OUTPUT' file='parser' value='3' type='xmlFeature'/>
+    <enum name='XML_WITH_PATTERN' file='parser' value='6' type='xmlFeature'/>
+    <enum name='XML_WITH_PUSH' file='parser' value='4' type='xmlFeature'/>
+    <enum name='XML_WITH_READER' file='parser' value='5' type='xmlFeature'/>
+    <enum name='XML_WITH_REGEXP' file='parser' value='22' type='xmlFeature'/>
+    <enum name='XML_WITH_SAX1' file='parser' value='8' type='xmlFeature'/>
+    <enum name='XML_WITH_SCHEMAS' file='parser' value='25' type='xmlFeature'/>
+    <enum name='XML_WITH_SCHEMATRON' file='parser' value='26' type='xmlFeature'/>
+    <enum name='XML_WITH_THREAD' file='parser' value='1' type='xmlFeature'/>
+    <enum name='XML_WITH_TREE' file='parser' value='2' type='xmlFeature'/>
+    <enum name='XML_WITH_UNICODE' file='parser' value='21' type='xmlFeature'/>
+    <enum name='XML_WITH_VALID' file='parser' value='11' type='xmlFeature'/>
+    <enum name='XML_WITH_WRITER' file='parser' value='7' type='xmlFeature'/>
+    <enum name='XML_WITH_XINCLUDE' file='parser' value='18' type='xmlFeature'/>
+    <enum name='XML_WITH_XPATH' file='parser' value='16' type='xmlFeature'/>
+    <enum name='XML_WITH_XPTR' file='parser' value='17' type='xmlFeature'/>
     <enum name='XML_XINCLUDE_BUILD_FAILED' file='xmlerror' value='1609' type='xmlParserErrors' info='1609'/>
     <enum name='XML_XINCLUDE_DEPRECATED_NS' file='xmlerror' value='1617' type='xmlParserErrors' info='1617'/>
     <enum name='XML_XINCLUDE_END' file='tree' value='20' type='xmlElementType'/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 2c325d98..f1c3c9e9 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -407,37 +407,6 @@
     <reference name='XML_EXTERNAL_GENERAL_PARSED_ENTITY' href='html/libxml-entities.html#XML_EXTERNAL_GENERAL_PARSED_ENTITY'/>
     <reference name='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY' href='html/libxml-entities.html#XML_EXTERNAL_GENERAL_UNPARSED_ENTITY'/>
     <reference name='XML_EXTERNAL_PARAMETER_ENTITY' href='html/libxml-entities.html#XML_EXTERNAL_PARAMETER_ENTITY'/>
-    <reference name='XML_FEATURE_AUTOMATA' href='html/libxml-parser.html#XML_FEATURE_AUTOMATA'/>
-    <reference name='XML_FEATURE_C14N' href='html/libxml-parser.html#XML_FEATURE_C14N'/>
-    <reference name='XML_FEATURE_CATALOG' href='html/libxml-parser.html#XML_FEATURE_CATALOG'/>
-    <reference name='XML_FEATURE_DEBUG' href='html/libxml-parser.html#XML_FEATURE_DEBUG'/>
-    <reference name='XML_FEATURE_DEBUG_MEM' href='html/libxml-parser.html#XML_FEATURE_DEBUG_MEM'/>
-    <reference name='XML_FEATURE_DEBUG_RUN' href='html/libxml-parser.html#XML_FEATURE_DEBUG_RUN'/>
-    <reference name='XML_FEATURE_EXPR' href='html/libxml-parser.html#XML_FEATURE_EXPR'/>
-    <reference name='XML_FEATURE_FTP' href='html/libxml-parser.html#XML_FEATURE_FTP'/>
-    <reference name='XML_FEATURE_HTML' href='html/libxml-parser.html#XML_FEATURE_HTML'/>
-    <reference name='XML_FEATURE_HTTP' href='html/libxml-parser.html#XML_FEATURE_HTTP'/>
-    <reference name='XML_FEATURE_ICONV' href='html/libxml-parser.html#XML_FEATURE_ICONV'/>
-    <reference name='XML_FEATURE_ISO8859X' href='html/libxml-parser.html#XML_FEATURE_ISO8859X'/>
-    <reference name='XML_FEATURE_LEGACY' href='html/libxml-parser.html#XML_FEATURE_LEGACY'/>
-    <reference name='XML_FEATURE_MODULES' href='html/libxml-parser.html#XML_FEATURE_MODULES'/>
-    <reference name='XML_FEATURE_NONE' href='html/libxml-parser.html#XML_FEATURE_NONE'/>
-    <reference name='XML_FEATURE_OUTPUT' href='html/libxml-parser.html#XML_FEATURE_OUTPUT'/>
-    <reference name='XML_FEATURE_PATTERN' href='html/libxml-parser.html#XML_FEATURE_PATTERN'/>
-    <reference name='XML_FEATURE_PUSH' href='html/libxml-parser.html#XML_FEATURE_PUSH'/>
-    <reference name='XML_FEATURE_READER' href='html/libxml-parser.html#XML_FEATURE_READER'/>
-    <reference name='XML_FEATURE_REGEXP' href='html/libxml-parser.html#XML_FEATURE_REGEXP'/>
-    <reference name='XML_FEATURE_SAX1' href='html/libxml-parser.html#XML_FEATURE_SAX1'/>
-    <reference name='XML_FEATURE_SCHEMAS' href='html/libxml-parser.html#XML_FEATURE_SCHEMAS'/>
-    <reference name='XML_FEATURE_SCHEMATRON' href='html/libxml-parser.html#XML_FEATURE_SCHEMATRON'/>
-    <reference name='XML_FEATURE_THREAD' href='html/libxml-parser.html#XML_FEATURE_THREAD'/>
-    <reference name='XML_FEATURE_TREE' href='html/libxml-parser.html#XML_FEATURE_TREE'/>
-    <reference name='XML_FEATURE_UNICODE' href='html/libxml-parser.html#XML_FEATURE_UNICODE'/>
-    <reference name='XML_FEATURE_VALID' href='html/libxml-parser.html#XML_FEATURE_VALID'/>
-    <reference name='XML_FEATURE_WRITER' href='html/libxml-parser.html#XML_FEATURE_WRITER'/>
-    <reference name='XML_FEATURE_XINCLUDE' href='html/libxml-parser.html#XML_FEATURE_XINCLUDE'/>
-    <reference name='XML_FEATURE_XPATH' href='html/libxml-parser.html#XML_FEATURE_XPATH'/>
-    <reference name='XML_FEATURE_XPTR' href='html/libxml-parser.html#XML_FEATURE_XPTR'/>
     <reference name='XML_FROM_C14N' href='html/libxml-xmlerror.html#XML_FROM_C14N'/>
     <reference name='XML_FROM_CATALOG' href='html/libxml-xmlerror.html#XML_FROM_CATALOG'/>
     <reference name='XML_FROM_CHECK' href='html/libxml-xmlerror.html#XML_FROM_CHECK'/>
@@ -1295,6 +1264,37 @@
     <reference name='XML_WAR_SPACE_VALUE' href='html/libxml-xmlerror.html#XML_WAR_SPACE_VALUE'/>
     <reference name='XML_WAR_UNDECLARED_ENTITY' href='html/libxml-xmlerror.html#XML_WAR_UNDECLARED_ENTITY'/>
     <reference name='XML_WAR_UNKNOWN_VERSION' href='html/libxml-xmlerror.html#XML_WAR_UNKNOWN_VERSION'/>
+    <reference name='XML_WITH_AUTOMATA' href='html/libxml-parser.html#XML_WITH_AUTOMATA'/>
+    <reference name='XML_WITH_C14N' href='html/libxml-parser.html#XML_WITH_C14N'/>
+    <reference name='XML_WITH_CATALOG' href='html/libxml-parser.html#XML_WITH_CATALOG'/>
+    <reference name='XML_WITH_DEBUG' href='html/libxml-parser.html#XML_WITH_DEBUG'/>
+    <reference name='XML_WITH_DEBUG_MEM' href='html/libxml-parser.html#XML_WITH_DEBUG_MEM'/>
+    <reference name='XML_WITH_DEBUG_RUN' href='html/libxml-parser.html#XML_WITH_DEBUG_RUN'/>
+    <reference name='XML_WITH_EXPR' href='html/libxml-parser.html#XML_WITH_EXPR'/>
+    <reference name='XML_WITH_FTP' href='html/libxml-parser.html#XML_WITH_FTP'/>
+    <reference name='XML_WITH_HTML' href='html/libxml-parser.html#XML_WITH_HTML'/>
+    <reference name='XML_WITH_HTTP' href='html/libxml-parser.html#XML_WITH_HTTP'/>
+    <reference name='XML_WITH_ICONV' href='html/libxml-parser.html#XML_WITH_ICONV'/>
+    <reference name='XML_WITH_ISO8859X' href='html/libxml-parser.html#XML_WITH_ISO8859X'/>
+    <reference name='XML_WITH_LEGACY' href='html/libxml-parser.html#XML_WITH_LEGACY'/>
+    <reference name='XML_WITH_MODULES' href='html/libxml-parser.html#XML_WITH_MODULES'/>
+    <reference name='XML_WITH_NONE' href='html/libxml-parser.html#XML_WITH_NONE'/>
+    <reference name='XML_WITH_OUTPUT' href='html/libxml-parser.html#XML_WITH_OUTPUT'/>
+    <reference name='XML_WITH_PATTERN' href='html/libxml-parser.html#XML_WITH_PATTERN'/>
+    <reference name='XML_WITH_PUSH' href='html/libxml-parser.html#XML_WITH_PUSH'/>
+    <reference name='XML_WITH_READER' href='html/libxml-parser.html#XML_WITH_READER'/>
+    <reference name='XML_WITH_REGEXP' href='html/libxml-parser.html#XML_WITH_REGEXP'/>
+    <reference name='XML_WITH_SAX1' href='html/libxml-parser.html#XML_WITH_SAX1'/>
+    <reference name='XML_WITH_SCHEMAS' href='html/libxml-parser.html#XML_WITH_SCHEMAS'/>
+    <reference name='XML_WITH_SCHEMATRON' href='html/libxml-parser.html#XML_WITH_SCHEMATRON'/>
+    <reference name='XML_WITH_THREAD' href='html/libxml-parser.html#XML_WITH_THREAD'/>
+    <reference name='XML_WITH_TREE' href='html/libxml-parser.html#XML_WITH_TREE'/>
+    <reference name='XML_WITH_UNICODE' href='html/libxml-parser.html#XML_WITH_UNICODE'/>
+    <reference name='XML_WITH_VALID' href='html/libxml-parser.html#XML_WITH_VALID'/>
+    <reference name='XML_WITH_WRITER' href='html/libxml-parser.html#XML_WITH_WRITER'/>
+    <reference name='XML_WITH_XINCLUDE' href='html/libxml-parser.html#XML_WITH_XINCLUDE'/>
+    <reference name='XML_WITH_XPATH' href='html/libxml-parser.html#XML_WITH_XPATH'/>
+    <reference name='XML_WITH_XPTR' href='html/libxml-parser.html#XML_WITH_XPTR'/>
     <reference name='XML_XINCLUDE_BUILD_FAILED' href='html/libxml-xmlerror.html#XML_XINCLUDE_BUILD_FAILED'/>
     <reference name='XML_XINCLUDE_DEPRECATED_NS' href='html/libxml-xmlerror.html#XML_XINCLUDE_DEPRECATED_NS'/>
     <reference name='XML_XINCLUDE_END' href='html/libxml-tree.html#XML_XINCLUDE_END'/>
@@ -3880,37 +3880,6 @@
       <ref name='XML_EXTERNAL_GENERAL_PARSED_ENTITY'/>
       <ref name='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY'/>
       <ref name='XML_EXTERNAL_PARAMETER_ENTITY'/>
-      <ref name='XML_FEATURE_AUTOMATA'/>
-      <ref name='XML_FEATURE_C14N'/>
-      <ref name='XML_FEATURE_CATALOG'/>
-      <ref name='XML_FEATURE_DEBUG'/>
-      <ref name='XML_FEATURE_DEBUG_MEM'/>
-      <ref name='XML_FEATURE_DEBUG_RUN'/>
-      <ref name='XML_FEATURE_EXPR'/>
-      <ref name='XML_FEATURE_FTP'/>
-      <ref name='XML_FEATURE_HTML'/>
-      <ref name='XML_FEATURE_HTTP'/>
-      <ref name='XML_FEATURE_ICONV'/>
-      <ref name='XML_FEATURE_ISO8859X'/>
-      <ref name='XML_FEATURE_LEGACY'/>
-      <ref name='XML_FEATURE_MODULES'/>
-      <ref name='XML_FEATURE_NONE'/>
-      <ref name='XML_FEATURE_OUTPUT'/>
-      <ref name='XML_FEATURE_PATTERN'/>
-      <ref name='XML_FEATURE_PUSH'/>
-      <ref name='XML_FEATURE_READER'/>
-      <ref name='XML_FEATURE_REGEXP'/>
-      <ref name='XML_FEATURE_SAX1'/>
-      <ref name='XML_FEATURE_SCHEMAS'/>
-      <ref name='XML_FEATURE_SCHEMATRON'/>
-      <ref name='XML_FEATURE_THREAD'/>
-      <ref name='XML_FEATURE_TREE'/>
-      <ref name='XML_FEATURE_UNICODE'/>
-      <ref name='XML_FEATURE_VALID'/>
-      <ref name='XML_FEATURE_WRITER'/>
-      <ref name='XML_FEATURE_XINCLUDE'/>
-      <ref name='XML_FEATURE_XPATH'/>
-      <ref name='XML_FEATURE_XPTR'/>
       <ref name='XML_FROM_C14N'/>
       <ref name='XML_FROM_CATALOG'/>
       <ref name='XML_FROM_CHECK'/>
@@ -4768,6 +4737,37 @@
       <ref name='XML_WAR_SPACE_VALUE'/>
       <ref name='XML_WAR_UNDECLARED_ENTITY'/>
       <ref name='XML_WAR_UNKNOWN_VERSION'/>
+      <ref name='XML_WITH_AUTOMATA'/>
+      <ref name='XML_WITH_C14N'/>
+      <ref name='XML_WITH_CATALOG'/>
+      <ref name='XML_WITH_DEBUG'/>
+      <ref name='XML_WITH_DEBUG_MEM'/>
+      <ref name='XML_WITH_DEBUG_RUN'/>
+      <ref name='XML_WITH_EXPR'/>
+      <ref name='XML_WITH_FTP'/>
+      <ref name='XML_WITH_HTML'/>
+      <ref name='XML_WITH_HTTP'/>
+      <ref name='XML_WITH_ICONV'/>
+      <ref name='XML_WITH_ISO8859X'/>
+      <ref name='XML_WITH_LEGACY'/>
+      <ref name='XML_WITH_MODULES'/>
+      <ref name='XML_WITH_NONE'/>
+      <ref name='XML_WITH_OUTPUT'/>
+      <ref name='XML_WITH_PATTERN'/>
+      <ref name='XML_WITH_PUSH'/>
+      <ref name='XML_WITH_READER'/>
+      <ref name='XML_WITH_REGEXP'/>
+      <ref name='XML_WITH_SAX1'/>
+      <ref name='XML_WITH_SCHEMAS'/>
+      <ref name='XML_WITH_SCHEMATRON'/>
+      <ref name='XML_WITH_THREAD'/>
+      <ref name='XML_WITH_TREE'/>
+      <ref name='XML_WITH_UNICODE'/>
+      <ref name='XML_WITH_VALID'/>
+      <ref name='XML_WITH_WRITER'/>
+      <ref name='XML_WITH_XINCLUDE'/>
+      <ref name='XML_WITH_XPATH'/>
+      <ref name='XML_WITH_XPTR'/>
       <ref name='XML_XINCLUDE_BUILD_FAILED'/>
       <ref name='XML_XINCLUDE_DEPRECATED_NS'/>
       <ref name='XML_XINCLUDE_END'/>
@@ -10974,37 +10974,6 @@
       <ref name='XML_COMPLETE_ATTRS'/>
       <ref name='XML_DEFAULT_VERSION'/>
       <ref name='XML_DETECT_IDS'/>
-      <ref name='XML_FEATURE_AUTOMATA'/>
-      <ref name='XML_FEATURE_C14N'/>
-      <ref name='XML_FEATURE_CATALOG'/>
-      <ref name='XML_FEATURE_DEBUG'/>
-      <ref name='XML_FEATURE_DEBUG_MEM'/>
-      <ref name='XML_FEATURE_DEBUG_RUN'/>
-      <ref name='XML_FEATURE_EXPR'/>
-      <ref name='XML_FEATURE_FTP'/>
-      <ref name='XML_FEATURE_HTML'/>
-      <ref name='XML_FEATURE_HTTP'/>
-      <ref name='XML_FEATURE_ICONV'/>
-      <ref name='XML_FEATURE_ISO8859X'/>
-      <ref name='XML_FEATURE_LEGACY'/>
-      <ref name='XML_FEATURE_MODULES'/>
-      <ref name='XML_FEATURE_NONE'/>
-      <ref name='XML_FEATURE_OUTPUT'/>
-      <ref name='XML_FEATURE_PATTERN'/>
-      <ref name='XML_FEATURE_PUSH'/>
-      <ref name='XML_FEATURE_READER'/>
-      <ref name='XML_FEATURE_REGEXP'/>
-      <ref name='XML_FEATURE_SAX1'/>
-      <ref name='XML_FEATURE_SCHEMAS'/>
-      <ref name='XML_FEATURE_SCHEMATRON'/>
-      <ref name='XML_FEATURE_THREAD'/>
-      <ref name='XML_FEATURE_TREE'/>
-      <ref name='XML_FEATURE_UNICODE'/>
-      <ref name='XML_FEATURE_VALID'/>
-      <ref name='XML_FEATURE_WRITER'/>
-      <ref name='XML_FEATURE_XINCLUDE'/>
-      <ref name='XML_FEATURE_XPATH'/>
-      <ref name='XML_FEATURE_XPTR'/>
       <ref name='XML_PARSER_ATTRIBUTE_VALUE'/>
       <ref name='XML_PARSER_CDATA_SECTION'/>
       <ref name='XML_PARSER_COMMENT'/>
@@ -11048,6 +11017,37 @@
       <ref name='XML_PARSE_XINCLUDE'/>
       <ref name='XML_SAX2_MAGIC'/>
       <ref name='XML_SKIP_IDS'/>
+      <ref name='XML_WITH_AUTOMATA'/>
+      <ref name='XML_WITH_C14N'/>
+      <ref name='XML_WITH_CATALOG'/>
+      <ref name='XML_WITH_DEBUG'/>
+      <ref name='XML_WITH_DEBUG_MEM'/>
+      <ref name='XML_WITH_DEBUG_RUN'/>
+      <ref name='XML_WITH_EXPR'/>
+      <ref name='XML_WITH_FTP'/>
+      <ref name='XML_WITH_HTML'/>
+      <ref name='XML_WITH_HTTP'/>
+      <ref name='XML_WITH_ICONV'/>
+      <ref name='XML_WITH_ISO8859X'/>
+      <ref name='XML_WITH_LEGACY'/>
+      <ref name='XML_WITH_MODULES'/>
+      <ref name='XML_WITH_NONE'/>
+      <ref name='XML_WITH_OUTPUT'/>
+      <ref name='XML_WITH_PATTERN'/>
+      <ref name='XML_WITH_PUSH'/>
+      <ref name='XML_WITH_READER'/>
+      <ref name='XML_WITH_REGEXP'/>
+      <ref name='XML_WITH_SAX1'/>
+      <ref name='XML_WITH_SCHEMAS'/>
+      <ref name='XML_WITH_SCHEMATRON'/>
+      <ref name='XML_WITH_THREAD'/>
+      <ref name='XML_WITH_TREE'/>
+      <ref name='XML_WITH_UNICODE'/>
+      <ref name='XML_WITH_VALID'/>
+      <ref name='XML_WITH_WRITER'/>
+      <ref name='XML_WITH_XINCLUDE'/>
+      <ref name='XML_WITH_XPATH'/>
+      <ref name='XML_WITH_XPTR'/>
       <ref name='_xmlParserCtxt'/>
       <ref name='_xmlParserInput'/>
       <ref name='_xmlParserNodeInfo'/>
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 2fe91d4a..46377ff2 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -1171,39 +1171,40 @@ XMLPUBFUN xmlDocPtr XMLCALL
  *
  * Used to examine the existance of features that can be enabled
  * or disabled at compile-time.
+ * They used to be called XML_FEATURE_xxx but this clashed with Expat
  */
 typedef enum {
-    XML_FEATURE_THREAD = 1,
-    XML_FEATURE_TREE = 2,
-    XML_FEATURE_OUTPUT = 3,
-    XML_FEATURE_PUSH = 4,
-    XML_FEATURE_READER = 5,
-    XML_FEATURE_PATTERN = 6,
-    XML_FEATURE_WRITER = 7,
-    XML_FEATURE_SAX1 = 8,
-    XML_FEATURE_FTP = 9,
-    XML_FEATURE_HTTP = 10,
-    XML_FEATURE_VALID = 11,
-    XML_FEATURE_HTML = 12,
-    XML_FEATURE_LEGACY = 13,
-    XML_FEATURE_C14N = 14,
-    XML_FEATURE_CATALOG = 15,
-    XML_FEATURE_XPATH = 16,
-    XML_FEATURE_XPTR = 17,
-    XML_FEATURE_XINCLUDE = 18,
-    XML_FEATURE_ICONV = 19,
-    XML_FEATURE_ISO8859X = 20,
-    XML_FEATURE_UNICODE = 21,
-    XML_FEATURE_REGEXP = 22,
-    XML_FEATURE_AUTOMATA = 23,
-    XML_FEATURE_EXPR = 24,
-    XML_FEATURE_SCHEMAS = 25,
-    XML_FEATURE_SCHEMATRON = 26,
-    XML_FEATURE_MODULES = 27,
-    XML_FEATURE_DEBUG = 28,
-    XML_FEATURE_DEBUG_MEM = 29,
-    XML_FEATURE_DEBUG_RUN = 30,
-    XML_FEATURE_NONE = 99999 /* just to be sure of allocation size */
+    XML_WITH_THREAD = 1,
+    XML_WITH_TREE = 2,
+    XML_WITH_OUTPUT = 3,
+    XML_WITH_PUSH = 4,
+    XML_WITH_READER = 5,
+    XML_WITH_PATTERN = 6,
+    XML_WITH_WRITER = 7,
+    XML_WITH_SAX1 = 8,
+    XML_WITH_FTP = 9,
+    XML_WITH_HTTP = 10,
+    XML_WITH_VALID = 11,
+    XML_WITH_HTML = 12,
+    XML_WITH_LEGACY = 13,
+    XML_WITH_C14N = 14,
+    XML_WITH_CATALOG = 15,
+    XML_WITH_XPATH = 16,
+    XML_WITH_XPTR = 17,
+    XML_WITH_XINCLUDE = 18,
+    XML_WITH_ICONV = 19,
+    XML_WITH_ISO8859X = 20,
+    XML_WITH_UNICODE = 21,
+    XML_WITH_REGEXP = 22,
+    XML_WITH_AUTOMATA = 23,
+    XML_WITH_EXPR = 24,
+    XML_WITH_SCHEMAS = 25,
+    XML_WITH_SCHEMATRON = 26,
+    XML_WITH_MODULES = 27,
+    XML_WITH_DEBUG = 28,
+    XML_WITH_DEBUG_MEM = 29,
+    XML_WITH_DEBUG_RUN = 30,
+    XML_WITH_NONE = 99999 /* just to be sure of allocation size */
 } xmlFeature;
 
 XMLPUBFUN int XMLCALL
diff --git a/parser.c b/parser.c
index 9c7247c1..ce6e0039 100644
--- a/parser.c
+++ b/parser.c
@@ -601,181 +601,181 @@ int
 xmlHasFeature(xmlFeature feature)
 {
     switch (feature) {
-	case XML_FEATURE_THREAD:
+	case XML_WITH_THREAD:
 #ifdef LIBXML_THREAD_ENABLED
 	    return(1);
 #else
 	    return(0);
 #endif
-        case XML_FEATURE_TREE:
+        case XML_WITH_TREE:
 #ifdef LIBXML_TREE_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_OUTPUT:
+        case XML_WITH_OUTPUT:
 #ifdef LIBXML_OUTPUT_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_PUSH:
+        case XML_WITH_PUSH:
 #ifdef LIBXML_PUSH_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_READER:
+        case XML_WITH_READER:
 #ifdef LIBXML_READER_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_PATTERN:
+        case XML_WITH_PATTERN:
 #ifdef LIBXML_PATTERN_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_WRITER:
+        case XML_WITH_WRITER:
 #ifdef LIBXML_WRITER_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_SAX1:
+        case XML_WITH_SAX1:
 #ifdef LIBXML_SAX1_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_FTP:
+        case XML_WITH_FTP:
 #ifdef LIBXML_FTP_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_HTTP:
+        case XML_WITH_HTTP:
 #ifdef LIBXML_HTTP_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_VALID:
+        case XML_WITH_VALID:
 #ifdef LIBXML_VALID_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_HTML:
+        case XML_WITH_HTML:
 #ifdef LIBXML_HTML_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_LEGACY:
+        case XML_WITH_LEGACY:
 #ifdef LIBXML_LEGACY_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_C14N:
+        case XML_WITH_C14N:
 #ifdef LIBXML_C14N_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_CATALOG:
+        case XML_WITH_CATALOG:
 #ifdef LIBXML_CATALOG_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_XPATH:
+        case XML_WITH_XPATH:
 #ifdef LIBXML_XPATH_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_XPTR:
+        case XML_WITH_XPTR:
 #ifdef LIBXML_XPTR_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_XINCLUDE:
+        case XML_WITH_XINCLUDE:
 #ifdef LIBXML_XINCLUDE_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_ICONV:
+        case XML_WITH_ICONV:
 #ifdef LIBXML_ICONV_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_ISO8859X:
+        case XML_WITH_ISO8859X:
 #ifdef LIBXML_ISO8859X_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_UNICODE:
+        case XML_WITH_UNICODE:
 #ifdef LIBXML_UNICODE_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_REGEXP:
+        case XML_WITH_REGEXP:
 #ifdef LIBXML_REGEXP_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_AUTOMATA:
+        case XML_WITH_AUTOMATA:
 #ifdef LIBXML_AUTOMATA_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_EXPR:
+        case XML_WITH_EXPR:
 #ifdef LIBXML_EXPR_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_SCHEMAS:
+        case XML_WITH_SCHEMAS:
 #ifdef LIBXML_SCHEMAS_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_SCHEMATRON:
+        case XML_WITH_SCHEMATRON:
 #ifdef LIBXML_SCHEMATRON_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_MODULES:
+        case XML_WITH_MODULES:
 #ifdef LIBXML_MODULES_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_DEBUG:
+        case XML_WITH_DEBUG:
 #ifdef LIBXML_DEBUG_ENABLED
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_DEBUG_MEM:
+        case XML_WITH_DEBUG_MEM:
 #ifdef DEBUG_MEMORY_LOCATION
             return(1);
 #else
             return(0);
 #endif
-        case XML_FEATURE_DEBUG_RUN:
+        case XML_WITH_DEBUG_RUN:
 #ifdef LIBXML_DEBUG_RUNTIME
             return(1);
 #else
diff --git a/testapi.c b/testapi.c
index 80338d7b..fe2d4c8f 100644
--- a/testapi.c
+++ b/testapi.c
@@ -1054,10 +1054,10 @@ static void des_xmlElementTypeVal(int no ATTRIBUTE_UNUSED, xmlElementTypeVal val
 
 #define gen_nb_xmlFeature 4
 static xmlFeature gen_xmlFeature(int no, int nr ATTRIBUTE_UNUSED) {
-    if (no == 1) return(XML_FEATURE_AUTOMATA);
-    if (no == 2) return(XML_FEATURE_C14N);
-    if (no == 3) return(XML_FEATURE_CATALOG);
-    if (no == 4) return(XML_FEATURE_DEBUG);
+    if (no == 1) return(XML_WITH_AUTOMATA);
+    if (no == 2) return(XML_WITH_C14N);
+    if (no == 3) return(XML_WITH_CATALOG);
+    if (no == 4) return(XML_WITH_DEBUG);
     return(0);
 }
 
diff --git a/xmllint.c b/xmllint.c
index f5f7d101..e8d3b4d9 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -2713,36 +2713,36 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
 static void showVersion(const char *name) {
     fprintf(stderr, "%s: using libxml version %s\n", name, xmlParserVersion);
     fprintf(stderr, "   compiled with: ");
-    if (xmlHasFeature(XML_FEATURE_THREAD)) fprintf(stderr, "Threads ");
-    if (xmlHasFeature(XML_FEATURE_TREE)) fprintf(stderr, "Tree ");
-    if (xmlHasFeature(XML_FEATURE_OUTPUT)) fprintf(stderr, "Output ");
-    if (xmlHasFeature(XML_FEATURE_PUSH)) fprintf(stderr, "Push ");
-    if (xmlHasFeature(XML_FEATURE_READER)) fprintf(stderr, "Reader ");
-    if (xmlHasFeature(XML_FEATURE_PATTERN)) fprintf(stderr, "Patterns ");
-    if (xmlHasFeature(XML_FEATURE_WRITER)) fprintf(stderr, "Writer ");
-    if (xmlHasFeature(XML_FEATURE_SAX1)) fprintf(stderr, "SAXv1 ");
-    if (xmlHasFeature(XML_FEATURE_FTP)) fprintf(stderr, "FTP "); 
-    if (xmlHasFeature(XML_FEATURE_HTTP)) fprintf(stderr, "HTTP "); 
-    if (xmlHasFeature(XML_FEATURE_VALID)) fprintf(stderr, "DTDValid ");
-    if (xmlHasFeature(XML_FEATURE_HTML)) fprintf(stderr, "HTML "); 
-    if (xmlHasFeature(XML_FEATURE_LEGACY)) fprintf(stderr, "Legacy "); 
-    if (xmlHasFeature(XML_FEATURE_C14N)) fprintf(stderr, "C14N "); 
-    if (xmlHasFeature(XML_FEATURE_CATALOG)) fprintf(stderr, "Catalog "); 
-    if (xmlHasFeature(XML_FEATURE_XPATH)) fprintf(stderr, "XPath "); 
-    if (xmlHasFeature(XML_FEATURE_XPTR)) fprintf(stderr, "XPointer "); 
-    if (xmlHasFeature(XML_FEATURE_XINCLUDE)) fprintf(stderr, "XInclude "); 
-    if (xmlHasFeature(XML_FEATURE_ICONV)) fprintf(stderr, "Iconv "); 
-    if (xmlHasFeature(XML_FEATURE_ISO8859X)) fprintf(stderr, "ISO8859X "); 
-    if (xmlHasFeature(XML_FEATURE_UNICODE)) fprintf(stderr, "Unicode "); 
-    if (xmlHasFeature(XML_FEATURE_REGEXP)) fprintf(stderr, "Regexps "); 
-    if (xmlHasFeature(XML_FEATURE_AUTOMATA)) fprintf(stderr, "Automata "); 
-    if (xmlHasFeature(XML_FEATURE_EXPR)) fprintf(stderr, "Expr "); 
-    if (xmlHasFeature(XML_FEATURE_SCHEMAS)) fprintf(stderr, "Schemas "); 
-    if (xmlHasFeature(XML_FEATURE_SCHEMATRON)) fprintf(stderr, "Schematron "); 
-    if (xmlHasFeature(XML_FEATURE_MODULES)) fprintf(stderr, "Modules "); 
-    if (xmlHasFeature(XML_FEATURE_DEBUG)) fprintf(stderr, "Debug "); 
-    if (xmlHasFeature(XML_FEATURE_DEBUG_MEM)) fprintf(stderr, "MemDebug "); 
-    if (xmlHasFeature(XML_FEATURE_DEBUG_RUN)) fprintf(stderr, "RunDebug "); 
+    if (xmlHasFeature(XML_WITH_THREAD)) fprintf(stderr, "Threads ");
+    if (xmlHasFeature(XML_WITH_TREE)) fprintf(stderr, "Tree ");
+    if (xmlHasFeature(XML_WITH_OUTPUT)) fprintf(stderr, "Output ");
+    if (xmlHasFeature(XML_WITH_PUSH)) fprintf(stderr, "Push ");
+    if (xmlHasFeature(XML_WITH_READER)) fprintf(stderr, "Reader ");
+    if (xmlHasFeature(XML_WITH_PATTERN)) fprintf(stderr, "Patterns ");
+    if (xmlHasFeature(XML_WITH_WRITER)) fprintf(stderr, "Writer ");
+    if (xmlHasFeature(XML_WITH_SAX1)) fprintf(stderr, "SAXv1 ");
+    if (xmlHasFeature(XML_WITH_FTP)) fprintf(stderr, "FTP "); 
+    if (xmlHasFeature(XML_WITH_HTTP)) fprintf(stderr, "HTTP "); 
+    if (xmlHasFeature(XML_WITH_VALID)) fprintf(stderr, "DTDValid ");
+    if (xmlHasFeature(XML_WITH_HTML)) fprintf(stderr, "HTML "); 
+    if (xmlHasFeature(XML_WITH_LEGACY)) fprintf(stderr, "Legacy "); 
+    if (xmlHasFeature(XML_WITH_C14N)) fprintf(stderr, "C14N "); 
+    if (xmlHasFeature(XML_WITH_CATALOG)) fprintf(stderr, "Catalog "); 
+    if (xmlHasFeature(XML_WITH_XPATH)) fprintf(stderr, "XPath "); 
+    if (xmlHasFeature(XML_WITH_XPTR)) fprintf(stderr, "XPointer "); 
+    if (xmlHasFeature(XML_WITH_XINCLUDE)) fprintf(stderr, "XInclude "); 
+    if (xmlHasFeature(XML_WITH_ICONV)) fprintf(stderr, "Iconv "); 
+    if (xmlHasFeature(XML_WITH_ISO8859X)) fprintf(stderr, "ISO8859X "); 
+    if (xmlHasFeature(XML_WITH_UNICODE)) fprintf(stderr, "Unicode "); 
+    if (xmlHasFeature(XML_WITH_REGEXP)) fprintf(stderr, "Regexps "); 
+    if (xmlHasFeature(XML_WITH_AUTOMATA)) fprintf(stderr, "Automata "); 
+    if (xmlHasFeature(XML_WITH_EXPR)) fprintf(stderr, "Expr "); 
+    if (xmlHasFeature(XML_WITH_SCHEMAS)) fprintf(stderr, "Schemas "); 
+    if (xmlHasFeature(XML_WITH_SCHEMATRON)) fprintf(stderr, "Schematron "); 
+    if (xmlHasFeature(XML_WITH_MODULES)) fprintf(stderr, "Modules "); 
+    if (xmlHasFeature(XML_WITH_DEBUG)) fprintf(stderr, "Debug "); 
+    if (xmlHasFeature(XML_WITH_DEBUG_MEM)) fprintf(stderr, "MemDebug "); 
+    if (xmlHasFeature(XML_WITH_DEBUG_RUN)) fprintf(stderr, "RunDebug "); 
     fprintf(stderr, "\n");
 }