diff --git a/ChangeLog b/ChangeLog
index f7821333..05a29e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb  9 21:58:56 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+	* doc/Makefile.am doc/libxslt-api.xml doc/libxslt-refs.xml 
+	  doc/EXSLT/libexslt-api.xml: applied patch for make wiki from
+	  Joel Reed and rebuild
+	* tests/plugins/Makefile.am: fix from Joel Reed for make dist
+
 Sun Jan 30 20:01:21 CET 2005 Daniel Veillard <daniel@veillard.com>
 
 	* tests/plugins/testplugin.c win32/Makefile.msvc win32/configure.js:
diff --git a/doc/EXSLT/libexslt-api.xml b/doc/EXSLT/libexslt-api.xml
index b4efcd85..a0625f02 100644
--- a/doc/EXSLT/libexslt-api.xml
+++ b/doc/EXSLT/libexslt-api.xml
@@ -2,11 +2,11 @@
 <api name='libexslt'>
   <files>
     <file name='exslt'>
-     <exports symbol='EXSLT_COMMON_NAMESPACE' type='macro'/>
      <exports symbol='EXSLT_DATE_NAMESPACE' type='macro'/>
-     <exports symbol='EXSLT_FUNCTIONS_NAMESPACE' type='macro'/>
      <exports symbol='EXSLT_STRINGS_NAMESPACE' type='macro'/>
      <exports symbol='SAXON_NAMESPACE' type='macro'/>
+     <exports symbol='EXSLT_COMMON_NAMESPACE' type='macro'/>
+     <exports symbol='EXSLT_FUNCTIONS_NAMESPACE' type='macro'/>
      <exports symbol='EXSLT_SETS_NAMESPACE' type='macro'/>
      <exports symbol='EXSLT_DYNAMIC_NAMESPACE' type='macro'/>
      <exports symbol='EXSLT_CRYPTO_NAMESPACE' type='macro'/>
@@ -17,14 +17,14 @@
      <exports symbol='exsltLibxsltVersion' type='variable'/>
      <exports symbol='exsltDynRegister' type='function'/>
      <exports symbol='exsltCommonRegister' type='function'/>
-     <exports symbol='exsltMathRegister' type='function'/>
-     <exports symbol='exsltStrRegister' type='function'/>
-     <exports symbol='exsltFuncRegister' type='function'/>
-     <exports symbol='exsltSaxonRegister' type='function'/>
      <exports symbol='exsltRegisterAll' type='function'/>
+     <exports symbol='exsltFuncRegister' type='function'/>
+     <exports symbol='exsltStrRegister' type='function'/>
      <exports symbol='exsltSetsRegister' type='function'/>
      <exports symbol='exsltDateRegister' type='function'/>
      <exports symbol='exsltCryptoRegister' type='function'/>
+     <exports symbol='exsltMathRegister' type='function'/>
+     <exports symbol='exsltSaxonRegister' type='function'/>
     </file>
     <file name='exsltexports'>
      <exports symbol='LIBEXSLT_PUBLIC' type='macro'/>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5300786d..3d8535f8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -122,6 +122,11 @@ html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
 	  echo "Validating the resulting XHTML pages" ; \
 	  $(bindir)/xmllint --nonet --valid --noout html/*.html ; fi );
 
+wiki: libxslt-api.xml $(srcdir)/wiki.xsl
+	-@(if [ -x $(bindir)/xsltproc ] ; then \
+		echo "Rebuilding the wiki HTML pages from the XSLT API" ; \
+		$(bindir)/xsltproc --nonet $(srcdir)/wiki.xsl libxslt-api.xml; fi )
+
 EXSLT/html/index.html: EXSLT/libexslt-api.xml \
 	$(srcdir)/newapi.xsl
 	-@(if [ -x $(bindir)/xsltproc ] ; then \
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 19fb8586..6b0907d7 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -300,6 +300,7 @@
      <exports symbol='XSLT_MAX_SORT' type='macro'/>
      <exports symbol='XSLT_RUNTIME_EXTRA' type='macro'/>
      <exports symbol='CHECK_STOPPEDE' type='macro'/>
+     <exports symbol='XML_CAST_FPTR' type='macro'/>
      <exports symbol='XSLT_FUNC_ELEMENT' type='enum'/>
      <exports symbol='XSLT_FUNC_VALUEOF' type='enum'/>
      <exports symbol='XSLT_FUNC_WITHPARAM' type='enum'/>
@@ -508,6 +509,10 @@
     </macro>
     <macro name='UNDEFINED_DEFAULT_NS' file='namespaces'>
     </macro>
+    <macro name='XML_CAST_FPTR' file='xsltInternals'>
+      <info>Macro to do a casting from an object pointer to a function pointer without encountering a warning from gcc</info>
+      <arg name='fptr' info='pointer to a function'/>
+    </macro>
     <macro name='XSLTCALL' file='xsltexports'>
     </macro>
     <macro name='XSLTPUBFUN' file='xsltexports'>
@@ -724,7 +729,6 @@
     <struct name='xsltRuntimeExtra' file='xsltInternals' type='struct _xsltRuntimeExtra'>
       <field name='info' type='void *' info=' pointer to the extra data'/>
       <field name='deallocate' type='xmlFreeFunc' info=' pointer to the deallocation routine'/>
-      <field name='val' type='void *' info=' data not needing deallocation'/>
     </struct>
     <typedef name='xsltRuntimeExtraPtr' file='xsltInternals' type='xsltRuntimeExtra *'/>
     <typedef name='xsltSecurityOption' file='security' type='enum'/>
@@ -847,7 +851,9 @@ informations are stored'/>
 *'/>
       <field name='defaultAlias' type='const xmlChar *' info='* bypass pre-processing (already done) (used in imports)
 *'/>
-      <field name='nopreproc' type='int' info=''/>
+      <field name='nopreproc' type='int' info='* all document text strings were internalized
+*'/>
+      <field name='internalized' type='int' info=''/>
     </struct>
     <typedef name='xsltStylesheetPtr' file='xsltInternals' type='xsltStylesheet *'/>
     <struct name='xsltTemplate' file='xsltInternals' type='struct _xsltTemplate'>
@@ -857,8 +863,8 @@ informations are stored'/>
       <field name='priority' type='float' info=' as given from the stylesheet, not computed'/>
       <field name='name' type='xmlChar *' info=' the local part of the name QName'/>
       <field name='nameURI' type='xmlChar *' info=' the URI part of the name QName'/>
-      <field name='mode' type='xmlChar *' info=' the local part of the mode QName'/>
-      <field name='modeURI' type='xmlChar *' info=' the URI part of the mode QName'/>
+      <field name='mode' type='const xmlChar *' info=' the local part of the mode QName'/>
+      <field name='modeURI' type='const xmlChar *' info=' the URI part of the mode QName'/>
       <field name='content' type='xmlNodePtr' info=' the template replacement value'/>
       <field name='elem' type='xmlNodePtr' info=' the source element'/>
       <field name='inheritedNsNr' type='int' info=' number of inherited namespaces'/>
@@ -925,7 +931,12 @@ informations are stored'/>
       <field name='traceCode' type='unsigned long *' info=' pointer to the variable holding the mask'/>
       <field name='parserOptions' type='int' info='* dictionnary: shared between stylesheet, context and documents.
 *'/>
-      <field name='dict' type='xmlDictPtr' info=''/>
+      <field name='dict' type='xmlDictPtr' info='* temporary storage for doc ptr, currently only used for
+* global var evaluation
+*'/>
+      <field name='tmpDoc' type='xmlDocPtr' info='* all document text strings are internalized
+*'/>
+      <field name='internalized' type='int' info=''/>
     </struct>
     <typedef name='xsltTransformContextPtr' file='xsltInternals' type='xsltTransformContext *'/>
     <typedef name='xsltTransformState' file='xsltInternals' type='enum'/>
@@ -2305,7 +2316,7 @@ informations are stored'/>
       <arg name='node' type='xmlNodePtr' info='the attribute template node'/>
     </function>
     <function name='xsltTestCompMatchList' file='pattern'>
-      <info>Test wether the node matches one of the patterns in the list</info>
+      <info>Test whether the node matches one of the patterns in the list</info>
       <return type='int' info='1 if it matches, 0 if it doesn&apos;t and -1 in case of failure'/>
       <arg name='ctxt' type='xsltTransformContextPtr' info='a XSLT process context'/>
       <arg name='node' type='xmlNodePtr' info='a node'/>
diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index 4b28a1fb..007c4a8f 100644
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -10,6 +10,7 @@
     <reference name='LIBXSLT_PUBLIC' href='html/libxslt-xsltexports.html#LIBXSLT_PUBLIC'/>
     <reference name='NODE_IS_KEYED' href='html/libxslt-keys.html#NODE_IS_KEYED'/>
     <reference name='UNDEFINED_DEFAULT_NS' href='html/libxslt-namespaces.html#UNDEFINED_DEFAULT_NS'/>
+    <reference name='XML_CAST_FPTR' href='html/libxslt-xsltInternals.html#XML_CAST_FPTR'/>
     <reference name='XSLTCALL' href='html/libxslt-xsltexports.html#XSLTCALL'/>
     <reference name='XSLTPUBFUN' href='html/libxslt-xsltexports.html#XSLTPUBFUN'/>
     <reference name='XSLTPUBVAR' href='html/libxslt-xsltexports.html#XSLTPUBVAR'/>
@@ -409,6 +410,7 @@
       <ref name='UNDEFINED_DEFAULT_NS'/>
     </letter>
     <letter name='X'>
+      <ref name='XML_CAST_FPTR'/>
       <ref name='XSLTCALL'/>
       <ref name='XSLTPUBFUN'/>
       <ref name='XSLTPUBVAR'/>
@@ -1741,6 +1743,7 @@
       <ref name='CHECK_STOPPED'/>
       <ref name='CHECK_STOPPED0'/>
       <ref name='CHECK_STOPPEDE'/>
+      <ref name='XML_CAST_FPTR'/>
       <ref name='XSLT_FUNC_APPLYIMPORTS'/>
       <ref name='XSLT_FUNC_APPLYTEMPLATES'/>
       <ref name='XSLT_FUNC_ATTRIBUTE'/>
@@ -2218,6 +2221,7 @@
           <ref name='CHECK_STOPPED'/>
           <ref name='CHECK_STOPPED0'/>
           <ref name='CHECK_STOPPEDE'/>
+          <ref name='XML_CAST_FPTR'/>
           <ref name='XSLT_RUNTIME_EXTRA'/>
           <ref name='XSLT_RUNTIME_EXTRA_FREE'/>
           <ref name='XSLT_RUNTIME_EXTRA_LST'/>
@@ -2676,6 +2680,8 @@
         <word name='all'>
           <ref name='XSLT_REGISTER_FUNCTION_LOOKUP'/>
           <ref name='XSLT_REGISTER_VARIABLE_LOOKUP'/>
+          <ref name='_xsltStylesheet'/>
+          <ref name='_xsltTransformContext'/>
           <ref name='xsltCleanupGlobals'/>
           <ref name='xsltFreeCompMatchList'/>
           <ref name='xsltFreeDocuments'/>
@@ -2793,6 +2799,7 @@
         <word name='are'>
           <ref name='_xsltDocument'/>
           <ref name='_xsltStylesheet'/>
+          <ref name='_xsltTransformContext'/>
           <ref name='xslHandleDebugger'/>
           <ref name='xsltApplyOneTemplate'/>
           <ref name='xsltCopyNamespace'/>
@@ -3104,6 +3111,9 @@
         <word name='cases'>
           <ref name='xsltLoadStylesheetPI'/>
         </word>
+        <word name='casting'>
+          <ref name='XML_CAST_FPTR'/>
+        </word>
         <word name='catch'>
           <ref name='_xsltFormatNumberInfo'/>
         </word>
@@ -3315,6 +3325,9 @@
           <ref name='xsltPrintErrorContext'/>
           <ref name='xsltTransformError'/>
         </word>
+        <word name='currently'>
+          <ref name='_xsltTransformContext'/>
+        </word>
       </letter>
     </chunk>
     <chunk name='chunk3'>
@@ -3498,6 +3511,7 @@
           <ref name='xsltTransformError'/>
         </word>
         <word name='doc'>
+          <ref name='_xsltTransformContext'/>
           <ref name='xsltLoadStylesheetPI'/>
         </word>
         <word name='docs'>
@@ -3581,6 +3595,9 @@
           <ref name='xsltRunStylesheet'/>
           <ref name='xsltRunStylesheetUser'/>
         </word>
+        <word name='encountering'>
+          <ref name='XML_CAST_FPTR'/>
+        </word>
         <word name='end'>
           <ref name='_xsltElemPreComp'/>
           <ref name='xsltRegisterPersistRVT'/>
@@ -3622,6 +3639,7 @@
         </word>
         <word name='evaluation'>
           <ref name='_xsltStackElem'/>
+          <ref name='_xsltTransformContext'/>
         </word>
         <word name='everything'>
           <ref name='xsltFindElemSpaceHandling'/>
@@ -3842,6 +3860,7 @@
         <word name='from'>
           <ref name='CHECK_STOPPED'/>
           <ref name='CHECK_STOPPED0'/>
+          <ref name='XML_CAST_FPTR'/>
           <ref name='XSLT_GET_IMPORT_INT'/>
           <ref name='XSLT_GET_IMPORT_PTR'/>
           <ref name='_xsltTemplate'/>
@@ -3878,6 +3897,9 @@
         <word name='gathering'>
           <ref name='xsltTimestamp'/>
         </word>
+        <word name='gcc'>
+          <ref name='XML_CAST_FPTR'/>
+        </word>
         <word name='general'>
           <ref name='XSLT_REGISTER_FUNCTION_LOOKUP'/>
           <ref name='XSLT_REGISTER_VARIABLE_LOOKUP'/>
@@ -4190,6 +4212,10 @@
         <word name='intergers'>
           <ref name='XSLT_GET_IMPORT_INT'/>
         </word>
+        <word name='internalized'>
+          <ref name='_xsltStylesheet'/>
+          <ref name='_xsltTransformContext'/>
+        </word>
         <word name='internally'>
           <ref name='XSLT_STRANGE'/>
         </word>
@@ -4583,9 +4609,6 @@
           <ref name='xsltXPathGetTransformContext'/>
           <ref name='xsltXPathVariableLookup'/>
         </word>
-        <word name='needing'>
-          <ref name='_xsltRuntimeExtra'/>
-        </word>
         <word name='needs'>
           <ref name='xsltEvalUserParams'/>
           <ref name='xsltGetTemplate'/>
@@ -4663,6 +4686,7 @@
       </letter>
       <letter name='o'>
         <word name='object'>
+          <ref name='XML_CAST_FPTR'/>
           <ref name='xsltDocumentFunction'/>
           <ref name='xsltKeyFunction'/>
           <ref name='xsltSystemPropertyFunction'/>
@@ -4709,6 +4733,7 @@
           <ref name='xsltCleanupTemplates'/>
         </word>
         <word name='only'>
+          <ref name='_xsltTransformContext'/>
           <ref name='xsltExtElementLookup'/>
           <ref name='xsltRunStylesheet'/>
           <ref name='xsltRunStylesheetUser'/>
@@ -4934,8 +4959,10 @@
           <ref name='xsltXPathVariableLookup'/>
         </word>
         <word name='pointer'>
+          <ref name='XML_CAST_FPTR'/>
           <ref name='_xsltRuntimeExtra'/>
           <ref name='_xsltTransformContext'/>
+          <ref name='fptr'/>
           <ref name='xsltDocLoaderFunc'/>
           <ref name='xsltExtInitFunction'/>
           <ref name='xsltFreeAVTList'/>
@@ -5155,6 +5182,9 @@
           <ref name='xsltRunStylesheetUser'/>
           <ref name='xsltSecurityCheck'/>
         </word>
+        <word name='ptr'>
+          <ref name='_xsltTransformContext'/>
+        </word>
         <word name='purpose'>
           <ref name='XSLT_REGISTER_FUNCTION_LOOKUP'/>
           <ref name='XSLT_REGISTER_VARIABLE_LOOKUP'/>
@@ -5625,6 +5655,7 @@
         </word>
         <word name='storage'>
           <ref name='_xsltDocument'/>
+          <ref name='_xsltTransformContext'/>
         </word>
         <word name='store'>
           <ref name='xsltInitElemPreComp'/>
@@ -5641,6 +5672,10 @@
         <word name='string?'>
           <ref name='xsltFormatNumberFunction'/>
         </word>
+        <word name='strings'>
+          <ref name='_xsltStylesheet'/>
+          <ref name='_xsltTransformContext'/>
+        </word>
         <word name='strip-space'>
           <ref name='_xsltStylesheet'/>
           <ref name='xsltFindElemSpaceHandling'/>
@@ -6065,6 +6100,9 @@
           <ref name='xsltRunStylesheet'/>
           <ref name='xsltRunStylesheetUser'/>
         </word>
+        <word name='var'>
+          <ref name='_xsltTransformContext'/>
+        </word>
         <word name='variable'>
           <ref name='_xsltStylesheet'/>
           <ref name='_xsltTransformContext'/>
@@ -6109,6 +6147,9 @@
         <word name='want'>
           <ref name='xsltEvalUserParams'/>
         </word>
+        <word name='warning'>
+          <ref name='XML_CAST_FPTR'/>
+        </word>
         <word name='warnings'>
           <ref name='_xsltStylesheet'/>
         </word>
@@ -6125,8 +6166,8 @@
         <word name='went'>
           <ref name='xsltParseStylesheetProcess'/>
         </word>
-        <word name='wether'>
-          <ref name='xsltTestCompMatchList'/>
+        <word name='were'>
+          <ref name='_xsltStylesheet'/>
         </word>
         <word name='when'>
           <ref name='XSLT_PARSE_OPTIONS'/>
@@ -6153,6 +6194,7 @@
           <ref name='xsltEvalStaticAttrValueTemplate'/>
           <ref name='xsltNeedElemSpaceHandling'/>
           <ref name='xsltSetXIncludeDefault'/>
+          <ref name='xsltTestCompMatchList'/>
         </word>
         <word name='which'>
           <ref name='xsltDocLoaderFunc'/>
@@ -6210,6 +6252,7 @@
           <ref name='xsltLoadStylesheetPI'/>
         </word>
         <word name='without'>
+          <ref name='XML_CAST_FPTR'/>
           <ref name='XSLT_PAT_NO_PRIORITY'/>
           <ref name='_xsltTransformContext'/>
         </word>
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index 94dacd10..01a4a06f 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -9,15 +9,16 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = plugin.out	plugin.xml plugin.xsl
 
-all:
-
-if WITH_MODULES
 pkglib_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
 
 xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
 xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(XSLT_LIBS)
 
+all:
+
+if WITH_MODULES
+
 test-logall:
 	@echo '## Running plugin tests'
 	@echo '##  Note: installing xmlsoft_org_xslt_testplugin.so'