- configure.in: preparing 0.12.0 releaseLIBXSLT_0_12_0

- libxslt/transform.c: a bit of cleanup on the XInclude defaults
- libxslt/xsltconfig.h.in: added doc inline comment
- libxslt/xslt.[ch] libxslt/xsltproc.c: added more version informations
  and enriched xsltproc --version to show them
- doc/html/*.html: rebuilt the docs
- doc/Makefile.am libxslt.spec.in: try to make sure John Fleck
  tutorial ends up in the tars and RPMs
Daniel

22 files changed, 900 insertions, 302 deletions

diff --git a/ChangeLog b/ChangeLog
index 456c1341..fac48b3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sun Jun 17 13:15:48 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in: preparing 0.12.0 release
+	* libxslt/transform.c: a bit of cleanup on the XInclude defaults
+	* libxslt/xsltconfig.h.in: added doc inline comment
+	* libxslt/xslt.[ch] libxslt/xsltproc.c: added more version informations
+	  and enriched xsltproc --version to show them
+	* doc/html/*.html: rebuilt the docs
+	* doc/Makefile.am libxslt.spec.in: try to make sure John Fleck
+	  tutorial ends up in the tars and RPMs
+
 Sat Jun 16 23:58:57 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* libxslt.spec.in: updated the descriptions
diff --git a/configure.in b/configure.in
index f254c150..e9101ea4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(libxslt/xslt.c)
 
 LIBXSLT_MAJOR_VERSION=0
-LIBXSLT_MINOR_VERSION=11
+LIBXSLT_MINOR_VERSION=12
 LIBXSLT_MICRO_VERSION=0
 PACKAGE=libxslt
 
@@ -126,7 +126,7 @@ dnl
 dnl find libxml
 dnl
 XML_CONFIG="xml2-config"
-AC_MSG_CHECKING(for libxml libraries >= 2.3.10) 
+AC_MSG_CHECKING(for libxml libraries >= 2.3.11) 
 if test "x$LIBXML_PREFIX" != "x"
 then
 	if ${LIBXML_PREFIX}/bin/xml2-config --libs print > /dev/null 2>&1
@@ -143,13 +143,13 @@ dnl
 if test "x$XML_CONFIG" != "x"
 then
 	vers=`$XML_CONFIG --version | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	if test "$vers" -ge 2003010
+	if test "$vers" -ge 2003011
 	then
 		LIBXML_LIBS="`$XML_CONFIG --libs`"
 		LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
 		AC_MSG_RESULT(found)
 	else
-		AC_MSG_ERROR(You need at least libxml2 2.3.10 for this version of libxslt)
+		AC_MSG_ERROR(You need at least libxml2 2.3.11 for this version of libxslt)
 	fi
 else
 	AC_MSG_ERROR(Could not find libxml2 anywhere, check ftp://xmlsoft.org/.)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 11b92ee3..de330846 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,9 +13,6 @@ HTML_DIR=$(prefix)/doc
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html
 
-# htmldir = $(prefix)/html
-# html_DATA = gnome-dev-info.html
-
 scan:
 	gtkdoc-scan --module=libxslt --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
 
@@ -47,9 +44,11 @@ install-data-local:
 	-@INSTALL@ -m 0644 $(srcdir)/xml.html $(DESTDIR)$(TARGET_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
+	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
 	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
 
 dist-hook:
-	(cd $(srcdir) ; tar cvf - *.html *.gif html/*.html html/*.sgml) | (cd $(distdir); tar xf -)
+	(cd $(srcdir) ; tar cvf - *.html *.gif html/*.html html/*.sgml tutorial/libxslt*) | (cd $(distdir); tar xf -)
 
 .PHONY : html sgml templates scan
diff --git a/doc/html/libxslt-attributes.html b/doc/html/libxslt-attributes.html
index 2fdf6461..ca6829fb 100644
--- a/doc/html/libxslt-attributes.html
+++ b/doc/html/libxslt-attributes.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-ATTRIBUTES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN1972"
+NAME="AEN2065"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN1972"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN1975"
+NAME="AEN2068"
 ></A
 ><H2
 >Synopsis</H2
@@ -189,7 +189,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1988"
+NAME="AEN2081"
 ></A
 ><H2
 >Description</H2
@@ -199,14 +199,14 @@ NAME="AEN1988"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1991"
+NAME="AEN2084"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1993"
+NAME="AEN2086"
 ></A
 ><H3
 ><A
@@ -241,7 +241,7 @@ elements needing preserving</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2001"
+NAME="AEN2094"
 ></A
 ><P
 ></P
@@ -296,7 +296,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2014"
+NAME="AEN2107"
 ></A
 ><H3
 ><A
@@ -326,7 +326,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2021"
+NAME="AEN2114"
 ></A
 ><P
 ></P
@@ -364,7 +364,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2030"
+NAME="AEN2123"
 ></A
 ><H3
 ><A
@@ -406,7 +406,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2040"
+NAME="AEN2133"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-functions.html b/doc/html/libxslt-functions.html
index 8093f55f..770d00d6 100644
--- a/doc/html/libxslt-functions.html
+++ b/doc/html/libxslt-functions.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-FUNCTIONS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN82"
+NAME="AEN103"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN82"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN85"
+NAME="AEN106"
 ></A
 ><H2
 >Synopsis</H2
@@ -223,7 +223,7 @@ HREF="XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN106"
+NAME="AEN127"
 ></A
 ><H2
 >Description</H2
@@ -233,14 +233,14 @@ NAME="AEN106"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN109"
+NAME="AEN130"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN111"
+NAME="AEN132"
 ></A
 ><H3
 ><A
@@ -275,7 +275,7 @@ node-set document(object, node-set?)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN119"
+NAME="AEN140"
 ></A
 ><P
 ></P
@@ -330,7 +330,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN132"
+NAME="AEN153"
 ></A
 ><H3
 ><A
@@ -365,7 +365,7 @@ node-set key(string, object)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN140"
+NAME="AEN161"
 ></A
 ><P
 ></P
@@ -420,7 +420,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN153"
+NAME="AEN174"
 ></A
 ><H3
 ><A
@@ -455,7 +455,7 @@ string unparsed-entity-uri(string)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN161"
+NAME="AEN182"
 ></A
 ><P
 ></P
@@ -510,7 +510,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN174"
+NAME="AEN195"
 ></A
 ><H3
 ><A
@@ -545,7 +545,7 @@ string format-number(number, string, string?)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN182"
+NAME="AEN203"
 ></A
 ><P
 ></P
@@ -600,7 +600,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN195"
+NAME="AEN216"
 ></A
 ><H3
 ><A
@@ -635,7 +635,7 @@ string generate-id(node-set?)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN203"
+NAME="AEN224"
 ></A
 ><P
 ></P
@@ -690,7 +690,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN216"
+NAME="AEN237"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@ object system-property(string)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN224"
+NAME="AEN245"
 ></A
 ><P
 ></P
@@ -780,7 +780,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN237"
+NAME="AEN258"
 ></A
 ><H3
 ><A
@@ -815,7 +815,7 @@ boolean element-available(string)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN245"
+NAME="AEN266"
 ></A
 ><P
 ></P
@@ -870,7 +870,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN258"
+NAME="AEN279"
 ></A
 ><H3
 ><A
@@ -905,7 +905,7 @@ boolean function-available(string)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN266"
+NAME="AEN287"
 ></A
 ><P
 ></P
@@ -960,7 +960,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN279"
+NAME="AEN300"
 ></A
 ><H3
 ><A
@@ -990,7 +990,7 @@ HREF="XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN286"
+NAME="AEN307"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-imports.html b/doc/html/libxslt-imports.html
index 71d3be51..507cb3b9 100644
--- a/doc/html/libxslt-imports.html
+++ b/doc/html/libxslt-imports.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-IMPORTS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2066"
+NAME="AEN2159"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN2066"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2069"
+NAME="AEN2162"
 ></A
 ><H2
 >Synopsis</H2
@@ -221,7 +221,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2091"
+NAME="AEN2184"
 ></A
 ><H2
 >Description</H2
@@ -231,14 +231,14 @@ NAME="AEN2091"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2094"
+NAME="AEN2187"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2096"
+NAME="AEN2189"
 ></A
 ><H3
 ><A
@@ -265,7 +265,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2102"
+NAME="AEN2195"
 ></A
 ><P
 ></P
@@ -337,7 +337,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2119"
+NAME="AEN2212"
 ></A
 ><H3
 ><A
@@ -364,7 +364,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2125"
+NAME="AEN2218"
 ></A
 ><P
 ></P
@@ -436,7 +436,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2142"
+NAME="AEN2235"
 ></A
 ><H3
 ><A
@@ -471,7 +471,7 @@ elements needing stripping</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2150"
+NAME="AEN2243"
 ></A
 ><P
 ></P
@@ -526,7 +526,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2163"
+NAME="AEN2256"
 ></A
 ><H3
 ><A
@@ -561,7 +561,7 @@ elements needing stripping</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2171"
+NAME="AEN2264"
 ></A
 ><P
 ></P
@@ -616,7 +616,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2184"
+NAME="AEN2277"
 ></A
 ><H3
 ><A
@@ -649,7 +649,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2192"
+NAME="AEN2285"
 ></A
 ><P
 ></P
@@ -702,7 +702,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2205"
+NAME="AEN2298"
 ></A
 ><H3
 ><A
@@ -737,7 +737,7 @@ respect the import precedence or the wildcards</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2213"
+NAME="AEN2306"
 ></A
 ><P
 ></P
@@ -808,7 +808,7 @@ should be CDTATA wrapped.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2230"
+NAME="AEN2323"
 ></A
 ><H3
 ><A
@@ -849,7 +849,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2240"
+NAME="AEN2333"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-keys.html b/doc/html/libxslt-keys.html
index acfacd24..c73ceacd 100644
--- a/doc/html/libxslt-keys.html
+++ b/doc/html/libxslt-keys.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-KEYS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2774"
+NAME="AEN2904"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN2774"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2777"
+NAME="AEN2907"
 ></A
 ><H2
 >Synopsis</H2
@@ -226,7 +226,7 @@ HREF="libxslt-xsltinternals.html#XSLTDOCUMENTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2800"
+NAME="AEN2930"
 ></A
 ><H2
 >Description</H2
@@ -236,14 +236,14 @@ NAME="AEN2800"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2803"
+NAME="AEN2933"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2805"
+NAME="AEN2935"
 ></A
 ><H3
 ><A
@@ -293,7 +293,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2817"
+NAME="AEN2947"
 ></A
 ><P
 ></P
@@ -431,7 +431,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2850"
+NAME="AEN2980"
 ></A
 ><H3
 ><A
@@ -476,7 +476,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2861"
+NAME="AEN2991"
 ></A
 ><P
 ></P
@@ -580,7 +580,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2886"
+NAME="AEN3016"
 ></A
 ><H3
 ><A
@@ -615,7 +615,7 @@ Should be done before global varibales are initialized.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2894"
+NAME="AEN3024"
 ></A
 ><P
 ></P
@@ -670,7 +670,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2907"
+NAME="AEN3037"
 ></A
 ><H3
 ><A
@@ -700,7 +700,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2914"
+NAME="AEN3044"
 ></A
 ><P
 ></P
@@ -738,7 +738,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2923"
+NAME="AEN3053"
 ></A
 ><H3
 ><A
@@ -768,7 +768,7 @@ HREF="libxslt-xsltinternals.html#XSLTDOCUMENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2930"
+NAME="AEN3060"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-namespaces.html b/doc/html/libxslt-namespaces.html
index 0577a593..4308fdb8 100644
--- a/doc/html/libxslt-namespaces.html
+++ b/doc/html/libxslt-namespaces.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-NAMESPACES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2266"
+NAME="AEN2359"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN2266"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2269"
+NAME="AEN2362"
 ></A
 ><H2
 >Synopsis</H2
@@ -208,6 +208,24 @@ HREF="XMLNODEPTR"
 HREF="XMLNSPTR"
 >xmlNsPtr</GTKDOCLINK
 >    <A
+HREF="libxslt-namespaces.html#XSLTCOPYNAMESPACE"
+>xsltCopyNamespace</A
+>               (<A
+HREF="libxslt-xsltinternals.html#XSLTTRANSFORMCONTEXTPTR"
+>xsltTransformContextPtr</A
+> ctxt,
+                                             <GTKDOCLINK
+HREF="XMLNODEPTR"
+>xmlNodePtr</GTKDOCLINK
+> node,
+                                             <GTKDOCLINK
+HREF="XMLNSPTR"
+>xmlNsPtr</GTKDOCLINK
+> cur);
+<GTKDOCLINK
+HREF="XMLNSPTR"
+>xmlNsPtr</GTKDOCLINK
+>    <A
 HREF="libxslt-namespaces.html#XSLTCOPYNAMESPACELIST"
 >xsltCopyNamespaceList</A
 >           (<A
@@ -236,7 +254,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2295"
+NAME="AEN2393"
 ></A
 ><H2
 >Description</H2
@@ -246,14 +264,14 @@ NAME="AEN2295"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2298"
+NAME="AEN2396"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2300"
+NAME="AEN2398"
 ></A
 ><H3
 ><A
@@ -288,7 +306,7 @@ them as well as the corresponding namespace.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2308"
+NAME="AEN2406"
 ></A
 ><P
 ></P
@@ -343,7 +361,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2321"
+NAME="AEN2419"
 ></A
 ><H3
 ><A
@@ -390,7 +408,7 @@ Handle namespace aliases</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2332"
+NAME="AEN2430"
 ></A
 ><P
 ></P
@@ -494,7 +512,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2357"
+NAME="AEN2455"
 ></A
 ><H3
 ><A
@@ -544,7 +562,7 @@ and add a new namespace decalaration on the node</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2369"
+NAME="AEN2467"
 ></A
 ><P
 ></P
@@ -665,7 +683,142 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2398"
+NAME="AEN2496"
+></A
+><H3
+><A
+NAME="XSLTCOPYNAMESPACE"
+></A
+>xsltCopyNamespace ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="XMLNSPTR"
+>xmlNsPtr</GTKDOCLINK
+>    xsltCopyNamespace               (<A
+HREF="libxslt-xsltinternals.html#XSLTTRANSFORMCONTEXTPTR"
+>xsltTransformContextPtr</A
+> ctxt,
+                                             <GTKDOCLINK
+HREF="XMLNODEPTR"
+>xmlNodePtr</GTKDOCLINK
+> node,
+                                             <GTKDOCLINK
+HREF="XMLNSPTR"
+>xmlNsPtr</GTKDOCLINK
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do a copy of an namespace node. If <TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+> is non-NULL the
+new namespaces are added automatically. This handles namespaces
+aliases</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN2507"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a transformation context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the target node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the namespace node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a new xmlNsPtr, or NULL in case of error.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN2528"
 ></A
 ><H3
 ><A
@@ -713,7 +866,7 @@ aliases</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2409"
+NAME="AEN2539"
 ></A
 ><P
 ></P
@@ -800,7 +953,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2430"
+NAME="AEN2560"
 ></A
 ><H3
 ><A
@@ -830,7 +983,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2437"
+NAME="AEN2567"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-numbersinternals.html b/doc/html/libxslt-numbersinternals.html
index 8e8b30f4..9fb01207 100644
--- a/doc/html/libxslt-numbersinternals.html
+++ b/doc/html/libxslt-numbersinternals.html
@@ -110,7 +110,7 @@ NAME="LIBXSLT-NUMBERSINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3426"
+NAME="AEN3556"
 ></A
 ><H2
 >Name</H2
@@ -118,7 +118,7 @@ NAME="AEN3426"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3429"
+NAME="AEN3559"
 ></A
 ><H2
 >Synopsis</H2
@@ -177,7 +177,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3442"
+NAME="AEN3572"
 ></A
 ><H2
 >Description</H2
@@ -187,14 +187,14 @@ NAME="AEN3442"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3445"
+NAME="AEN3575"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3447"
+NAME="AEN3577"
 ></A
 ><H3
 ><A
@@ -237,7 +237,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3457"
+NAME="AEN3587"
 ></A
 ><P
 ></P
@@ -341,7 +341,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3482"
+NAME="AEN3612"
 ></A
 ><H3
 ><A
@@ -377,7 +377,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3490"
+NAME="AEN3620"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-pattern.html b/doc/html/libxslt-pattern.html
index 45e0ee51..09d4a66f 100644
--- a/doc/html/libxslt-pattern.html
+++ b/doc/html/libxslt-pattern.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-PATTERN"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN300"
+NAME="AEN321"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN300"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN303"
+NAME="AEN324"
 ></A
 ><H2
 >Synopsis</H2
@@ -266,7 +266,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN337"
+NAME="AEN358"
 ></A
 ><H2
 >Description</H2
@@ -276,14 +276,14 @@ NAME="AEN337"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN340"
+NAME="AEN361"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN342"
+NAME="AEN363"
 ></A
 ><H3
 ><A
@@ -312,7 +312,7 @@ It is kept private (in pattern.c)</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN348"
+NAME="AEN369"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN353"
+NAME="AEN374"
 ></A
 ><H3
 ><A
@@ -382,7 +382,7 @@ for fast matching.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN364"
+NAME="AEN385"
 ></A
 ><P
 ></P
@@ -469,7 +469,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN385"
+NAME="AEN406"
 ></A
 ><H3
 ><A
@@ -504,7 +504,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN393"
+NAME="AEN414"
 ></A
 ><P
 ></P
@@ -542,7 +542,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN402"
+NAME="AEN423"
 ></A
 ><H3
 ><A
@@ -580,7 +580,7 @@ HREF="libxslt-pattern.html#XSLTCOMPMATCHPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN411"
+NAME="AEN432"
 ></A
 ><P
 ></P
@@ -667,7 +667,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN432"
+NAME="AEN453"
 ></A
 ><H3
 ><A
@@ -714,7 +714,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN443"
+NAME="AEN464"
 ></A
 ><P
 ></P
@@ -818,7 +818,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN468"
+NAME="AEN489"
 ></A
 ><H3
 ><A
@@ -865,7 +865,7 @@ it means one need to look for the next imported template in scope.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN479"
+NAME="AEN500"
 ></A
 ><P
 ></P
@@ -952,7 +952,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN500"
+NAME="AEN521"
 ></A
 ><H3
 ><A
@@ -982,7 +982,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN507"
+NAME="AEN528"
 ></A
 ><P
 ></P
@@ -1020,7 +1020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN516"
+NAME="AEN537"
 ></A
 ><H3
 ><A
@@ -1051,7 +1051,7 @@ the ones it imports.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN523"
+NAME="AEN544"
 ></A
 ><P
 ></P
@@ -1089,7 +1089,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN532"
+NAME="AEN553"
 ></A
 ><H3
 ><A
@@ -1127,7 +1127,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN541"
+NAME="AEN562"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-templates.html b/doc/html/libxslt-templates.html
index ea28143c..db81c800 100644
--- a/doc/html/libxslt-templates.html
+++ b/doc/html/libxslt-templates.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-TEMPLATES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN567"
+NAME="AEN588"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN567"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN570"
+NAME="AEN591"
 ></A
 ><H2
 >Synopsis</H2
@@ -309,7 +309,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN616"
+NAME="AEN637"
 ></A
 ><H2
 >Description</H2
@@ -319,14 +319,14 @@ NAME="AEN616"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN619"
+NAME="AEN640"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN621"
+NAME="AEN642"
 ></A
 ><H3
 ><A
@@ -366,7 +366,7 @@ an XPath predicate</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN630"
+NAME="AEN651"
 ></A
 ><P
 ></P
@@ -476,7 +476,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN656"
+NAME="AEN677"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@ This is needed for example by xsl:comment and xsl:processing-instruction</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN666"
+NAME="AEN687"
 ></A
 ><P
 ></P
@@ -607,7 +607,7 @@ caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN687"
+NAME="AEN708"
 ></A
 ><H3
 ><A
@@ -654,7 +654,7 @@ substituted by they computed value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN698"
+NAME="AEN719"
 ></A
 ><P
 ></P
@@ -759,7 +759,7 @@ caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN723"
+NAME="AEN744"
 ></A
 ><H3
 ><A
@@ -806,7 +806,7 @@ attribute value does not contain expressions contained in curly braces ({})</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN734"
+NAME="AEN755"
 ></A
 ><P
 ></P
@@ -928,7 +928,7 @@ caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN763"
+NAME="AEN784"
 ></A
 ><H3
 ><A
@@ -965,7 +965,7 @@ HREF="XMLXPATHCOMPEXPRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN772"
+NAME="AEN793"
 ></A
 ><P
 ></P
@@ -1036,7 +1036,7 @@ caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN789"
+NAME="AEN810"
 ></A
 ><H3
 ><A
@@ -1073,7 +1073,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN798"
+NAME="AEN819"
 ></A
 ><P
 ></P
@@ -1143,7 +1143,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN815"
+NAME="AEN836"
 ></A
 ><H3
 ><A
@@ -1184,7 +1184,7 @@ HREF="XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN825"
+NAME="AEN846"
 ></A
 ><P
 ></P
@@ -1271,7 +1271,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN846"
+NAME="AEN867"
 ></A
 ><H3
 ><A
@@ -1312,7 +1312,7 @@ HREF="XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN856"
+NAME="AEN877"
 ></A
 ><P
 ></P
@@ -1399,7 +1399,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN877"
+NAME="AEN898"
 ></A
 ><H3
 ><A
@@ -1436,7 +1436,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN886"
+NAME="AEN907"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-transform.html b/doc/html/libxslt-transform.html
index eb51995f..7add13ac 100644
--- a/doc/html/libxslt-transform.html
+++ b/doc/html/libxslt-transform.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-TRANSFORM"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN908"
+NAME="AEN929"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN908"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN911"
+NAME="AEN932"
 ></A
 ><H2
 >Synopsis</H2
@@ -145,6 +145,14 @@ CELLPADDING="6"
 CLASS="SYNOPSIS"
 >&#13;
 
+void        <A
+HREF="libxslt-transform.html#XSLTSETXINCLUDEDEFAULT"
+>xsltSetXIncludeDefault</A
+>          (int xinclude);
+int         <A
+HREF="libxslt-transform.html#XSLTGETXINCLUDEDEFAULT"
+>xsltGetXIncludeDefault</A
+>          (void);
 <GTKDOCLINK
 HREF="XMLDOCPTR"
 >xmlDocPtr</GTKDOCLINK
@@ -506,7 +514,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1007"
+NAME="AEN1030"
 ></A
 ><H2
 >Description</H2
@@ -516,14 +524,142 @@ NAME="AEN1007"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1010"
+NAME="AEN1033"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1012"
+NAME="AEN1035"
+></A
+><H3
+><A
+NAME="XSLTSETXINCLUDEDEFAULT"
+></A
+>xsltSetXIncludeDefault ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xsltSetXIncludeDefault          (int xinclude);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Set whether XInclude should be processed on document being loaded by default</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN1041"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>xinclude</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> whether to do XInclude processing</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1050"
+></A
+><H3
+><A
+NAME="XSLTGETXINCLUDEDEFAULT"
+></A
+>xsltGetXIncludeDefault ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xsltGetXIncludeDefault          (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>return the default state for XInclude processing</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN1056"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 if there is no processing 1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1065"
 ></A
 ><H3
 ><A
@@ -562,7 +698,7 @@ NOTE: This may lead to a non-wellformed output XML wise !</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1021"
+NAME="AEN1074"
 ></A
 ><P
 ></P
@@ -649,7 +785,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1042"
+NAME="AEN1095"
 ></A
 ><H3
 ><A
@@ -688,7 +824,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1051"
+NAME="AEN1104"
 ></A
 ><P
 ></P
@@ -777,7 +913,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1072"
+NAME="AEN1125"
 ></A
 ><H3
 ><A
@@ -819,7 +955,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1082"
+NAME="AEN1135"
 ></A
 ><P
 ></P
@@ -908,7 +1044,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1103"
+NAME="AEN1156"
 ></A
 ><H3
 ><A
@@ -944,14 +1080,14 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ></TR
 ></TABLE
 ><P
->function attached to xslt:sort nodes, but this should not be
+>function attached to xsl:sort nodes, but this should not be
 called directly</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1113"
+NAME="AEN1166"
 ></A
 ><P
 ></P
@@ -1040,7 +1176,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1187"
 ></A
 ><H3
 ><A
@@ -1082,7 +1218,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1144"
+NAME="AEN1197"
 ></A
 ><P
 ></P
@@ -1171,7 +1307,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1165"
+NAME="AEN1218"
 ></A
 ><H3
 ><A
@@ -1213,7 +1349,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1175"
+NAME="AEN1228"
 ></A
 ><P
 ></P
@@ -1302,7 +1438,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1196"
+NAME="AEN1249"
 ></A
 ><H3
 ><A
@@ -1344,7 +1480,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1206"
+NAME="AEN1259"
 ></A
 ><P
 ></P
@@ -1433,7 +1569,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1227"
+NAME="AEN1280"
 ></A
 ><H3
 ><A
@@ -1475,7 +1611,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1237"
+NAME="AEN1290"
 ></A
 ><P
 ></P
@@ -1564,7 +1700,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1258"
+NAME="AEN1311"
 ></A
 ><H3
 ><A
@@ -1606,7 +1742,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1268"
+NAME="AEN1321"
 ></A
 ><P
 ></P
@@ -1695,7 +1831,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1289"
+NAME="AEN1342"
 ></A
 ><H3
 ><A
@@ -1737,7 +1873,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1299"
+NAME="AEN1352"
 ></A
 ><P
 ></P
@@ -1826,7 +1962,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1320"
+NAME="AEN1373"
 ></A
 ><H3
 ><A
@@ -1868,7 +2004,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1330"
+NAME="AEN1383"
 ></A
 ><P
 ></P
@@ -1957,7 +2093,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1351"
+NAME="AEN1404"
 ></A
 ><H3
 ><A
@@ -1999,7 +2135,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1361"
+NAME="AEN1414"
 ></A
 ><P
 ></P
@@ -2088,7 +2224,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1382"
+NAME="AEN1435"
 ></A
 ><H3
 ><A
@@ -2130,7 +2266,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1392"
+NAME="AEN1445"
 ></A
 ><P
 ></P
@@ -2219,7 +2355,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1413"
+NAME="AEN1466"
 ></A
 ><H3
 ><A
@@ -2261,7 +2397,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1423"
+NAME="AEN1476"
 ></A
 ><P
 ></P
@@ -2350,7 +2486,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1444"
+NAME="AEN1497"
 ></A
 ><H3
 ><A
@@ -2392,7 +2528,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1454"
+NAME="AEN1507"
 ></A
 ><P
 ></P
@@ -2481,7 +2617,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1475"
+NAME="AEN1528"
 ></A
 ><H3
 ><A
@@ -2523,7 +2659,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1485"
+NAME="AEN1538"
 ></A
 ><P
 ></P
@@ -2612,7 +2748,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1506"
+NAME="AEN1559"
 ></A
 ><H3
 ><A
@@ -2654,7 +2790,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1516"
+NAME="AEN1569"
 ></A
 ><P
 ></P
@@ -2743,7 +2879,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1537"
+NAME="AEN1590"
 ></A
 ><H3
 ><A
@@ -2785,7 +2921,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1547"
+NAME="AEN1600"
 ></A
 ><P
 ></P
@@ -2874,7 +3010,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1568"
+NAME="AEN1621"
 ></A
 ><H3
 ><A
@@ -2916,7 +3052,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLEPRECOMPPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1578"
+NAME="AEN1631"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-variables.html b/doc/html/libxslt-variables.html
index 693ad4cc..a09e269a 100644
--- a/doc/html/libxslt-variables.html
+++ b/doc/html/libxslt-variables.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-VARIABLES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2451"
+NAME="AEN2581"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN2451"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2454"
+NAME="AEN2584"
 ></A
 ><H2
 >Synopsis</H2
@@ -281,7 +281,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2492"
+NAME="AEN2622"
 ></A
 ><H2
 >Description</H2
@@ -291,14 +291,14 @@ NAME="AEN2492"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2495"
+NAME="AEN2625"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2497"
+NAME="AEN2627"
 ></A
 ><H3
 ><A
@@ -325,7 +325,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2503"
+NAME="AEN2633"
 ></A
 ><P
 ></P
@@ -363,7 +363,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2512"
+NAME="AEN2642"
 ></A
 ><H3
 ><A
@@ -394,7 +394,7 @@ done on parsed stylesheets before starting to apply transformations</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2519"
+NAME="AEN2649"
 ></A
 ><P
 ></P
@@ -447,7 +447,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2532"
+NAME="AEN2662"
 ></A
 ><H3
 ><A
@@ -479,7 +479,7 @@ done on parsed stylesheets before starting to apply transformations</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2539"
+NAME="AEN2669"
 ></A
 ><P
 ></P
@@ -549,7 +549,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2556"
+NAME="AEN2686"
 ></A
 ><H3
 ><A
@@ -584,7 +584,7 @@ its value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2564"
+NAME="AEN2694"
 ></A
 ><P
 ></P
@@ -639,7 +639,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2577"
+NAME="AEN2707"
 ></A
 ><H3
 ><A
@@ -674,7 +674,7 @@ its value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2585"
+NAME="AEN2715"
 ></A
 ><P
 ></P
@@ -729,7 +729,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2598"
+NAME="AEN2728"
 ></A
 ><H3
 ><A
@@ -764,7 +764,7 @@ its value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2606"
+NAME="AEN2736"
 ></A
 ><P
 ></P
@@ -819,7 +819,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2619"
+NAME="AEN2749"
 ></A
 ><H3
 ><A
@@ -854,7 +854,7 @@ its value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2627"
+NAME="AEN2757"
 ></A
 ><P
 ></P
@@ -909,7 +909,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2640"
+NAME="AEN2770"
 ></A
 ><H3
 ><A
@@ -950,7 +950,7 @@ its value but doesn't record it.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2650"
+NAME="AEN2780"
 ></A
 ><P
 ></P
@@ -1020,7 +1020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2667"
+NAME="AEN2797"
 ></A
 ><H3
 ><A
@@ -1054,7 +1054,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTACKELEMPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2675"
+NAME="AEN2805"
 ></A
 ><P
 ></P
@@ -1124,7 +1124,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2692"
+NAME="AEN2822"
 ></A
 ><H3
 ><A
@@ -1155,7 +1155,7 @@ its value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2699"
+NAME="AEN2829"
 ></A
 ><P
 ></P
@@ -1193,7 +1193,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2708"
+NAME="AEN2838"
 ></A
 ><H3
 ><A
@@ -1235,7 +1235,7 @@ variable value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2718"
+NAME="AEN2848"
 ></A
 ><P
 ></P
@@ -1322,7 +1322,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2739"
+NAME="AEN2869"
 ></A
 ><H3
 ><A
@@ -1361,7 +1361,7 @@ interpretor.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2748"
+NAME="AEN2878"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-xslt.html b/doc/html/libxslt-xslt.html
index 1bdb5a07..37317258 100644
--- a/doc/html/libxslt-xslt.html
+++ b/doc/html/libxslt-xslt.html
@@ -164,6 +164,18 @@ HREF="libxslt-xslt.html#XSLT-NAMESPACE-CAPS"
 extern      int <A
 HREF="libxslt-xslt.html#XSLTMAXDEPTH"
 >xsltMaxDepth</A
+>;
+extern      const char *<A
+HREF="libxslt-xslt.html#XSLTENGINEVERSION"
+>xsltEngineVersion</A
+>;
+extern      const int <A
+HREF="libxslt-xslt.html#XSLTLIBXSLTVERSION"
+>xsltLibxsltVersion</A
+>;
+extern      const int <A
+HREF="libxslt-xslt.html#XSLTLIBXMLVERSION"
+>xsltLibxmlVersion</A
 >;</PRE
 ></TD
 ></TR
@@ -172,7 +184,7 @@ HREF="libxslt-xslt.html#XSLTMAXDEPTH"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN42"
+NAME="AEN45"
 ></A
 ><H2
 >Description</H2
@@ -182,14 +194,14 @@ NAME="AEN42"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN45"
+NAME="AEN48"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN47"
+NAME="AEN50"
 ></A
 ><H3
 ><A
@@ -217,7 +229,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN53"
+NAME="AEN56"
 ></A
 ><H3
 ><A
@@ -245,7 +257,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN59"
+NAME="AEN62"
 ></A
 ><H3
 ><A
@@ -273,7 +285,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN65"
+NAME="AEN68"
 ></A
 ><H3
 ><A
@@ -301,7 +313,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN71"
+NAME="AEN74"
 ></A
 ><H3
 ><A
@@ -326,6 +338,90 @@ CLASS="PROGRAMLISTING"
 ><P
 ></P
 ></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN80"
+></A
+><H3
+><A
+NAME="XSLTENGINEVERSION"
+></A
+>xsltEngineVersion</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern const char *xsltEngineVersion;</PRE
+></TD
+></TR
+></TABLE
+><P
+>The version string for libxslt</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN86"
+></A
+><H3
+><A
+NAME="XSLTLIBXSLTVERSION"
+></A
+>xsltLibxsltVersion</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern const int xsltLibxsltVersion;</PRE
+></TD
+></TR
+></TABLE
+><P
+>The version of libxslt compiled</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN92"
+></A
+><H3
+><A
+NAME="XSLTLIBXMLVERSION"
+></A
+>xsltLibxmlVersion</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern const int xsltLibxmlVersion;</PRE
+></TD
+></TR
+></TABLE
+><P
+>The version of libxml libxslt was compiled against</P
+><P
+></P
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/doc/html/libxslt-xsltinternals.html b/doc/html/libxslt-xsltinternals.html
index bcc0c3aa..6fb393dc 100644
--- a/doc/html/libxslt-xsltinternals.html
+++ b/doc/html/libxslt-xsltinternals.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-XSLTINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2944"
+NAME="AEN3074"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN2944"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2947"
+NAME="AEN3077"
 ></A
 ><H2
 >Synopsis</H2
@@ -385,7 +385,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3012"
+NAME="AEN3142"
 ></A
 ><H2
 >Description</H2
@@ -395,14 +395,14 @@ NAME="AEN3012"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3015"
+NAME="AEN3145"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3017"
+NAME="AEN3147"
 ></A
 ><H3
 ><A
@@ -430,7 +430,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3023"
+NAME="AEN3153"
 ></A
 ><H3
 ><A
@@ -458,7 +458,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3029"
+NAME="AEN3159"
 ></A
 ><H3
 ><A
@@ -497,7 +497,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3035"
+NAME="AEN3165"
 ></A
 ><H3
 ><A
@@ -523,7 +523,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3040"
+NAME="AEN3170"
 ></A
 ><H3
 ><A
@@ -567,7 +567,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3046"
+NAME="AEN3176"
 ></A
 ><H3
 ><A
@@ -593,7 +593,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3051"
+NAME="AEN3181"
 ></A
 ><H3
 ><A
@@ -626,7 +626,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3057"
+NAME="AEN3187"
 ></A
 ><H3
 ><A
@@ -652,7 +652,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3062"
+NAME="AEN3192"
 ></A
 ><H3
 ><A
@@ -710,6 +710,8 @@ CLASS="PROGRAMLISTING"
     xmlHashTablePtr   globalVars;	/* the global variables and params */
 
     xmlNodePtr inst;			/* the instruction in the stylesheet */
+
+    int xinclude;			/* should XInclude be processed */
 };</PRE
 ></TD
 ></TR
@@ -720,7 +722,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3067"
+NAME="AEN3197"
 ></A
 ><H3
 ><A
@@ -746,7 +748,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3072"
+NAME="AEN3202"
 ></A
 ><H3
 ><A
@@ -820,7 +822,7 @@ precomputed data.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3078"
+NAME="AEN3208"
 ></A
 ><H3
 ><A
@@ -846,7 +848,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3083"
+NAME="AEN3213"
 ></A
 ><H3
 ><A
@@ -889,7 +891,7 @@ stylesheet language like xsl:if or xsl:apply-templates.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3093"
+NAME="AEN3223"
 ></A
 ><P
 ></P
@@ -978,7 +980,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3114"
+NAME="AEN3244"
 ></A
 ><H3
 ><A
@@ -1026,7 +1028,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3119"
+NAME="AEN3249"
 ></A
 ><H3
 ><A
@@ -1061,7 +1063,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3124"
+NAME="AEN3254"
 ></A
 ><H3
 ><A
@@ -1087,7 +1089,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3129"
+NAME="AEN3259"
 ></A
 ><H3
 ><A
@@ -1195,7 +1197,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3134"
+NAME="AEN3264"
 ></A
 ><H3
 ><A
@@ -1221,7 +1223,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3139"
+NAME="AEN3269"
 ></A
 ><H3
 ><A
@@ -1251,7 +1253,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3144"
+NAME="AEN3274"
 ></A
 ><H3
 ><A
@@ -1281,7 +1283,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3149"
+NAME="AEN3279"
 ></A
 ><H3
 ><A
@@ -1310,7 +1312,7 @@ will return from the function</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3155"
+NAME="AEN3285"
 ></A
 ><H3
 ><A
@@ -1339,7 +1341,7 @@ will goto the error: label</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3161"
+NAME="AEN3291"
 ></A
 ><H3
 ><A
@@ -1368,7 +1370,7 @@ will return from the function with a 0 value</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3167"
+NAME="AEN3297"
 ></A
 ><H3
 ><A
@@ -1398,7 +1400,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3174"
+NAME="AEN3304"
 ></A
 ><P
 ></P
@@ -1434,7 +1436,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3183"
+NAME="AEN3313"
 ></A
 ><H3
 ><A
@@ -1467,7 +1469,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3191"
+NAME="AEN3321"
 ></A
 ><P
 ></P
@@ -1520,7 +1522,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3204"
+NAME="AEN3334"
 ></A
 ><H3
 ><A
@@ -1555,7 +1557,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3212"
+NAME="AEN3342"
 ></A
 ><P
 ></P
@@ -1593,7 +1595,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3221"
+NAME="AEN3351"
 ></A
 ><H3
 ><A
@@ -1623,7 +1625,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3228"
+NAME="AEN3358"
 ></A
 ><P
 ></P
@@ -1676,7 +1678,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3241"
+NAME="AEN3371"
 ></A
 ><H3
 ><A
@@ -1711,7 +1713,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3249"
+NAME="AEN3379"
 ></A
 ><P
 ></P
@@ -1749,7 +1751,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3258"
+NAME="AEN3388"
 ></A
 ><H3
 ><A
@@ -1787,7 +1789,7 @@ HREF="XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3267"
+NAME="AEN3397"
 ></A
 ><P
 ></P
@@ -1857,7 +1859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3284"
+NAME="AEN3414"
 ></A
 ><H3
 ><A
@@ -1895,7 +1897,7 @@ HREF="XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3293"
+NAME="AEN3423"
 ></A
 ><P
 ></P
@@ -1965,7 +1967,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3310"
+NAME="AEN3440"
 ></A
 ><H3
 ><A
@@ -2000,7 +2002,7 @@ information related to the stylesheet output</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3318"
+NAME="AEN3448"
 ></A
 ><P
 ></P
@@ -2055,7 +2057,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3331"
+NAME="AEN3461"
 ></A
 ><H3
 ><A
@@ -2088,7 +2090,7 @@ HREF="XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3339"
+NAME="AEN3469"
 ></A
 ><P
 ></P
@@ -2141,7 +2143,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3352"
+NAME="AEN3482"
 ></A
 ><H3
 ><A
@@ -2179,7 +2181,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3361"
+NAME="AEN3491"
 ></A
 ><P
 ></P
@@ -2251,7 +2253,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3378"
+NAME="AEN3508"
 ></A
 ><H3
 ><A
@@ -2330,7 +2332,7 @@ X      any other characters can be used in the prefix or suffix
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3396"
+NAME="AEN3526"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxslt-xsltutils.html b/doc/html/libxslt-xsltutils.html
index 408a8569..e740cff7 100644
--- a/doc/html/libxslt-xsltutils.html
+++ b/doc/html/libxslt-xsltutils.html
@@ -122,7 +122,7 @@ NAME="LIBXSLT-XSLTUTILS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN1604"
+NAME="AEN1657"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN1604"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN1607"
+NAME="AEN1660"
 ></A
 ><H2
 >Synopsis</H2
@@ -161,6 +161,24 @@ HREF="libxslt-xsltutils.html#IS-XSLT-ELEM-CAPS"
 HREF="libxslt-xsltutils.html#IS-XSLT-NAME-CAPS"
 >IS_XSLT_NAME</A
 >                    (n, val)
+<GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+>*    <A
+HREF="libxslt-xsltutils.html#XSLTGETNSPROP"
+>xsltGetNsProp</A
+>                   (<GTKDOCLINK
+HREF="XMLNODEPTR"
+>xmlNodePtr</GTKDOCLINK
+> node,
+                                             const <GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+> *name,
+                                             const <GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+> *namespace);
 extern      xmlGenericErrorFunc <A
 HREF="libxslt-xsltutils.html#XSLTGENERICERROR"
 >xsltGenericError</A
@@ -289,7 +307,7 @@ HREF="libxslt-xsltinternals.html#XSLTSTYLESHEETPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1645"
+NAME="AEN1703"
 ></A
 ><H2
 >Description</H2
@@ -299,14 +317,14 @@ NAME="AEN1645"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1648"
+NAME="AEN1706"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1650"
+NAME="AEN1708"
 ></A
 ><H3
 ><A
@@ -334,7 +352,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1656"
+NAME="AEN1714"
 ></A
 ><H3
 ><A
@@ -362,7 +380,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1662"
+NAME="AEN1720"
 ></A
 ><H3
 ><A
@@ -389,7 +407,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1668"
+NAME="AEN1726"
 ></A
 ><P
 ></P
@@ -427,7 +445,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1677"
+NAME="AEN1735"
 ></A
 ><H3
 ><A
@@ -454,7 +472,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1683"
+NAME="AEN1741"
 ></A
 ><P
 ></P
@@ -509,7 +527,150 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1696"
+NAME="AEN1754"
+></A
+><H3
+><A
+NAME="XSLTGETNSPROP"
+></A
+>xsltGetNsProp ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+>*    xsltGetNsProp                   (<GTKDOCLINK
+HREF="XMLNODEPTR"
+>xmlNodePtr</GTKDOCLINK
+> node,
+                                             const <GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+> *name,
+                                             const <GTKDOCLINK
+HREF="XMLCHAR"
+>xmlChar</GTKDOCLINK
+> *namespace);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Similar to <GTKDOCLINK
+HREF="XMLGETNSPROP"
+>xmlGetNsProp</GTKDOCLINK
+>() but with a slightly different semantic</P
+><P
+>Search and get the value of an attribute associated to a node
+This attribute has to be anchored in the namespace specified,
+or has no namespace and the element is in that namespace.</P
+><P
+>This does the entity substitution.
+This function looks in DTD attribute declaration for <GTKDOCLINK
+HREF="FIXED-CAPS"
+>FIXED</GTKDOCLINK
+> or
+default declaration values unless DTD use has been turned off.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN1768"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the attribute name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>namespace</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the URI of the namespace</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1789"
 ></A
 ><H3
 ><A
@@ -535,7 +696,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1701"
+NAME="AEN1794"
 ></A
 ><H3
 ><A
@@ -561,7 +722,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1706"
+NAME="AEN1799"
 ></A
 ><H3
 ><A
@@ -587,7 +748,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1711"
+NAME="AEN1804"
 ></A
 ><H3
 ><A
@@ -613,7 +774,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1716"
+NAME="AEN1809"
 ></A
 ><H3
 ><A
@@ -651,7 +812,7 @@ HREF="XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1725"
+NAME="AEN1818"
 ></A
 ><P
 ></P
@@ -723,7 +884,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1742"
+NAME="AEN1835"
 ></A
 ><H3
 ><A
@@ -785,7 +946,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1754"
+NAME="AEN1847"
 ></A
 ><P
 ></P
@@ -840,7 +1001,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1767"
+NAME="AEN1860"
 ></A
 ><H3
 ><A
@@ -902,7 +1063,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1779"
+NAME="AEN1872"
 ></A
 ><P
 ></P
@@ -957,7 +1118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1792"
+NAME="AEN1885"
 ></A
 ><H3
 ><A
@@ -992,7 +1153,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1800"
+NAME="AEN1893"
 ></A
 ><P
 ></P
@@ -1030,7 +1191,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1809"
+NAME="AEN1902"
 ></A
 ><H3
 ><A
@@ -1066,7 +1227,7 @@ requirement provided by the arry of nodes.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1817"
+NAME="AEN1910"
 ></A
 ><P
 ></P
@@ -1138,7 +1299,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1834"
+NAME="AEN1927"
 ></A
 ><H3
 ><A
@@ -1192,7 +1353,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1846"
+NAME="AEN1939"
 ></A
 ><P
 ></P
@@ -1279,7 +1440,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1867"
+NAME="AEN1960"
 ></A
 ><H3
 ><A
@@ -1331,7 +1492,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1878"
+NAME="AEN1971"
 ></A
 ><P
 ></P
@@ -1435,7 +1596,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1903"
+NAME="AEN1996"
 ></A
 ><H3
 ><A
@@ -1490,7 +1651,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1915"
+NAME="AEN2008"
 ></A
 ><P
 ></P
@@ -1577,7 +1738,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1936"
+NAME="AEN2029"
 ></A
 ><H3
 ><A
@@ -1624,7 +1785,7 @@ This does not close the descriptor.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1946"
+NAME="AEN2039"
 ></A
 ><P
 ></P
diff --git a/libxslt.spec.in b/libxslt.spec.in
index 40317a86..e2835273 100644
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO FEATURES
-%doc doc/*.html doc/html
+%doc doc/*.html doc/html doc/tutorial
 
 %{prefix}/lib/lib*.so.*
 %{prefix}/bin/xsltproc
diff --git a/libxslt/transform.c b/libxslt/transform.c
index c510b7c0..a24d3e53 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -122,13 +122,15 @@ static int xsltDoXIncludeDefault = 0;
  */
 void
 xsltSetXIncludeDefault(int xinclude) {
-    xsltDoXIncludeDefault = xinclude;
+    xsltDoXIncludeDefault = (xinclude != 0);
 }
 
 /**
  * xsltGetXIncludeDefault:
  *
- * Returns whether XInclude should be processed on document being loaded
+ * return the default state for XInclude processing
+ *
+ * Returns 0 if there is no processing 1 otherwise
  */
 int
 xsltGetXIncludeDefault(void) {
diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 47046d63..85b5dd6c 100644
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -40,6 +40,8 @@
 #endif
 
 const char *xsltEngineVersion = LIBXSLT_VERSION_STRING;
+const int xsltLibxsltVersion = LIBXSLT_VERSION;
+const int xsltLibxmlVersion = LIBXML_VERSION;
 
 /*
  * Useful macros
diff --git a/libxslt/xslt.h b/libxslt/xslt.h
index 0d9f16c0..813f6a4c 100644
--- a/libxslt/xslt.h
+++ b/libxslt/xslt.h
@@ -51,11 +51,26 @@ extern "C" {
 extern int xsltMaxDepth;
 
 /**
- * xslEngineVersion:
+ * xsltEngineVersion:
  *
  * The version string for libxslt
  */
 extern const char *xsltEngineVersion;
+
+/**
+ * xsltLibxsltVersion:
+ *
+ * The version of libxslt compiled
+ */
+extern const int xsltLibxsltVersion;
+
+/**
+ * xsltLibxmlVersion:
+ *
+ * The version of libxml libxslt was compiled against
+ */
+extern const int xsltLibxmlVersion;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
index 13e7f948..69143ba0 100644
--- a/libxslt/xsltconfig.h.in
+++ b/libxslt/xsltconfig.h.in
@@ -15,8 +15,25 @@
 extern "C" {
 #endif
 
+/**
+ * LIBXSLT_DOTTED_VERSION:
+ *
+ * the version string like "1.2.3"
+ */
 #define LIBXSLT_DOTTED_VERSION "@VERSION@"
+
+/**
+ * LIBXSLT_VERSION:
+ *
+ * the version number: 1.2.3 value is 1002003
+ */
 #define LIBXSLT_VERSION @LIBXSLT_VERSION_NUMBER@
+
+/**
+ * LIBXSLT_VERSION_STRING:
+ *
+ * the version number string, 1.2.3 value is "1002003"
+ */
 #define LIBXSLT_VERSION_STRING "@LIBXSLT_VERSION_NUMBER@"
 
 /**
diff --git a/libxslt/xsltproc.c b/libxslt/xsltproc.c
index ccf7b7bf..303c20d2 100644
--- a/libxslt/xsltproc.c
+++ b/libxslt/xsltproc.c
@@ -140,6 +140,10 @@ main(int argc, char **argv) {
 		   (!strcmp(argv[i], "--version"))) {
 	    printf("Using libxml %s and libxslt %s\n",
 		   xmlParserVersion, xsltEngineVersion);
+	    printf("xsltproc was compiled against libxml %d and libxslt %d\n",
+		   LIBXML_VERSION, LIBXSLT_VERSION);
+	    printf("libxslt %d was compiled against libxml %d\n",
+		   xsltLibxsltVersion, xsltLibxmlVersion);
 	} else if ((!strcmp(argv[i], "-repeat")) ||
 		   (!strcmp(argv[i], "--repeat"))) {
 	    if (repeat == 0)