diff --git a/doc/EXSLT/devhelp/libexslt-exsltexports.html b/doc/EXSLT/devhelp/libexslt-exsltexports.html
index b04b4c02..240da955 100644
--- a/doc/EXSLT/devhelp/libexslt-exsltexports.html
+++ b/doc/EXSLT/devhelp/libexslt-exsltexports.html
@@ -35,11 +35,11 @@
     </h2>
     <p>exsltexports - macros for marking symbols as exportable/importable. </p>
     <p/>
-    <p>Author(s): Igor Zlatkovic &lt;igor@zlatkovic.com&gt; </p>
+    <p>Author(s): </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#LIBEXSLT_PUBLIC">LIBEXSLT_PUBLIC</a>;
-#define <a href="#_REENTRANT">_REENTRANT</a>;
+#define <a href="#EXSLTPUBLIC">EXSLTPUBLIC</a>;
 #define <a href="#EXSLTCALL">EXSLTCALL</a>;
 #define <a href="#EXSLTPUBFUN">EXSLTPUBFUN</a>;
 #define <a href="#EXSLTPUBVAR">EXSLTPUBVAR</a>;
@@ -52,23 +52,23 @@
       <h2>Details</h2>
       <div class="refsect2" lang="en">
         <div class="refsect2" lang="en"><h3><a name="EXSLTCALL">Macro </a>EXSLTCALL</h3><pre class="programlisting">#define <a href="#EXSLTCALL">EXSLTCALL</a>;
-</pre><p/>
+</pre><p>Macro which declares the calling convention for exported functions</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="EXSLTPUBFUN">Macro </a>EXSLTPUBFUN</h3><pre class="programlisting">#define <a href="#EXSLTPUBFUN">EXSLTPUBFUN</a>;
-</pre><p/>
+</pre><p>Macro which declares an exportable function</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="EXSLTPUBLIC">Macro </a>EXSLTPUBLIC</h3><pre class="programlisting">#define <a href="#EXSLTPUBLIC">EXSLTPUBLIC</a>;
+</pre><p>Macro which declares a public symbol</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="EXSLTPUBVAR">Macro </a>EXSLTPUBVAR</h3><pre class="programlisting">#define <a href="#EXSLTPUBVAR">EXSLTPUBVAR</a>;
-</pre><p/>
+</pre><p>Macro which declares an exportable variable</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="LIBEXSLT_PUBLIC">Macro </a>LIBEXSLT_PUBLIC</h3><pre class="programlisting">#define <a href="#LIBEXSLT_PUBLIC">LIBEXSLT_PUBLIC</a>;
 </pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="_REENTRANT">Macro </a>_REENTRANT</h3><pre class="programlisting">#define <a href="#_REENTRANT">_REENTRANT</a>;
-</pre><p/>
 </div>
         <hr/>
       </div>
diff --git a/doc/EXSLT/devhelp/libexslt.devhelp2 b/doc/EXSLT/devhelp/libexslt.devhelp2
index 12020f8f..37e2debc 100644
--- a/doc/EXSLT/devhelp/libexslt.devhelp2
+++ b/doc/EXSLT/devhelp/libexslt.devhelp2
@@ -9,6 +9,7 @@
   <functions>
     <keyword type="macro" name="EXSLTCALL" link="libexslt-exsltexports.html#EXSLTCALL"/>
     <keyword type="macro" name="EXSLTPUBFUN" link="libexslt-exsltexports.html#EXSLTPUBFUN"/>
+    <keyword type="macro" name="EXSLTPUBLIC" link="libexslt-exsltexports.html#EXSLTPUBLIC"/>
     <keyword type="macro" name="EXSLTPUBVAR" link="libexslt-exsltexports.html#EXSLTPUBVAR"/>
     <keyword type="macro" name="EXSLT_COMMON_NAMESPACE" link="libexslt-exslt.html#EXSLT_COMMON_NAMESPACE"/>
     <keyword type="macro" name="EXSLT_CRYPTO_NAMESPACE" link="libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE"/>
@@ -20,7 +21,6 @@
     <keyword type="macro" name="EXSLT_STRINGS_NAMESPACE" link="libexslt-exslt.html#EXSLT_STRINGS_NAMESPACE"/>
     <keyword type="macro" name="LIBEXSLT_PUBLIC" link="libexslt-exsltexports.html#LIBEXSLT_PUBLIC"/>
     <keyword type="macro" name="SAXON_NAMESPACE" link="libexslt-exslt.html#SAXON_NAMESPACE"/>
-    <keyword type="macro" name="_REENTRANT" link="libexslt-exsltexports.html#_REENTRANT"/>
     <keyword type="macro" name="exsltLibexsltVersion" link="libexslt-exslt.html#exsltLibexsltVersion"/>
     <keyword type="macro" name="exsltLibraryVersion" link="libexslt-exslt.html#exsltLibraryVersion"/>
     <keyword type="macro" name="exsltLibxmlVersion" link="libexslt-exslt.html#exsltLibxmlVersion"/>
diff --git a/doc/EXSLT/libexslt-api.xml b/doc/EXSLT/libexslt-api.xml
index 1937bb2a..8c5760ab 100644
--- a/doc/EXSLT/libexslt-api.xml
+++ b/doc/EXSLT/libexslt-api.xml
@@ -33,9 +33,8 @@
     </file>
     <file name='exsltexports'>
      <summary>macros for marking symbols as exportable/importable. </summary>
-     <author>Igor Zlatkovic &lt;igor@zlatkovic.com&gt; </author>
      <exports symbol='LIBEXSLT_PUBLIC' type='macro'/>
-     <exports symbol='_REENTRANT' type='macro'/>
+     <exports symbol='EXSLTPUBLIC' type='macro'/>
      <exports symbol='EXSLTCALL' type='macro'/>
      <exports symbol='EXSLTPUBFUN' type='macro'/>
      <exports symbol='EXSLTPUBVAR' type='macro'/>
@@ -43,10 +42,16 @@
   </files>
   <symbols>
     <macro name='EXSLTCALL' file='exsltexports'>
+      <info>Macro which declares the calling convention for exported functions</info>
     </macro>
     <macro name='EXSLTPUBFUN' file='exsltexports'>
+      <info>Macro which declares an exportable function</info>
+    </macro>
+    <macro name='EXSLTPUBLIC' file='exsltexports'>
+      <info>Macro which declares a public symbol</info>
     </macro>
     <macro name='EXSLTPUBVAR' file='exsltexports'>
+      <info>Macro which declares an exportable variable</info>
     </macro>
     <macro name='EXSLT_COMMON_NAMESPACE' file='exslt'>
       <info>Namespace for EXSLT common functions</info>
@@ -77,8 +82,6 @@
     <macro name='SAXON_NAMESPACE' file='exslt'>
       <info>Namespace for SAXON extensions functions</info>
     </macro>
-    <macro name='_REENTRANT' file='exsltexports'>
-    </macro>
     <variable name='exsltLibexsltVersion' file='exslt' type='const int'/>
     <variable name='exsltLibraryVersion' file='exslt' type='const char *'/>
     <variable name='exsltLibxmlVersion' file='exslt' type='const int'/>
diff --git a/doc/EXSLT/libexslt-refs.xml b/doc/EXSLT/libexslt-refs.xml
index bddfb060..32f8d55b 100644
--- a/doc/EXSLT/libexslt-refs.xml
+++ b/doc/EXSLT/libexslt-refs.xml
@@ -3,6 +3,7 @@
   <references>
     <reference name='EXSLTCALL' href='html/libexslt-exsltexports.html#EXSLTCALL'/>
     <reference name='EXSLTPUBFUN' href='html/libexslt-exsltexports.html#EXSLTPUBFUN'/>
+    <reference name='EXSLTPUBLIC' href='html/libexslt-exsltexports.html#EXSLTPUBLIC'/>
     <reference name='EXSLTPUBVAR' href='html/libexslt-exsltexports.html#EXSLTPUBVAR'/>
     <reference name='EXSLT_COMMON_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE'/>
     <reference name='EXSLT_CRYPTO_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE'/>
@@ -14,7 +15,6 @@
     <reference name='EXSLT_STRINGS_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_STRINGS_NAMESPACE'/>
     <reference name='LIBEXSLT_PUBLIC' href='html/libexslt-exsltexports.html#LIBEXSLT_PUBLIC'/>
     <reference name='SAXON_NAMESPACE' href='html/libexslt-exslt.html#SAXON_NAMESPACE'/>
-    <reference name='_REENTRANT' href='html/libexslt-exsltexports.html#_REENTRANT'/>
     <reference name='exsltCommonRegister' href='html/libexslt-exslt.html#exsltCommonRegister'/>
     <reference name='exsltCryptoRegister' href='html/libexslt-exslt.html#exsltCryptoRegister'/>
     <reference name='exsltDateRegister' href='html/libexslt-exslt.html#exsltDateRegister'/>
@@ -38,6 +38,7 @@
     <letter name='E'>
       <ref name='EXSLTCALL'/>
       <ref name='EXSLTPUBFUN'/>
+      <ref name='EXSLTPUBLIC'/>
       <ref name='EXSLTPUBVAR'/>
       <ref name='EXSLT_COMMON_NAMESPACE'/>
       <ref name='EXSLT_CRYPTO_NAMESPACE'/>
@@ -54,9 +55,6 @@
     <letter name='S'>
       <ref name='SAXON_NAMESPACE'/>
     </letter>
-    <letter name='_'>
-      <ref name='_REENTRANT'/>
-    </letter>
     <letter name='e'>
       <ref name='exsltCommonRegister'/>
       <ref name='exsltCryptoRegister'/>
@@ -127,9 +125,9 @@
     <file name='exsltexports'>
       <ref name='EXSLTCALL'/>
       <ref name='EXSLTPUBFUN'/>
+      <ref name='EXSLTPUBLIC'/>
       <ref name='EXSLTPUBVAR'/>
       <ref name='LIBEXSLT_PUBLIC'/>
-      <ref name='_REENTRANT'/>
     </file>
   </files>
   <index>
@@ -182,6 +180,12 @@
         </word>
       </letter>
       <letter name='M'>
+        <word name='Macro'>
+          <ref name='EXSLTCALL'/>
+          <ref name='EXSLTPUBFUN'/>
+          <ref name='EXSLTPUBLIC'/>
+          <ref name='EXSLTPUBVAR'/>
+        </word>
         <word name='Math'>
           <ref name='exsltMathRegister'/>
           <ref name='exsltMathXpathCtxtRegister'/>
@@ -255,9 +259,15 @@
         </word>
       </letter>
       <letter name='c'>
+        <word name='calling'>
+          <ref name='EXSLTCALL'/>
+        </word>
         <word name='common'>
           <ref name='EXSLT_COMMON_NAMESPACE'/>
         </word>
+        <word name='convention'>
+          <ref name='EXSLTCALL'/>
+        </word>
         <word name='crypto'>
           <ref name='EXSLT_CRYPTO_NAMESPACE'/>
         </word>
@@ -266,11 +276,24 @@
         <word name='date'>
           <ref name='EXSLT_DATE_NAMESPACE'/>
         </word>
+        <word name='declares'>
+          <ref name='EXSLTCALL'/>
+          <ref name='EXSLTPUBFUN'/>
+          <ref name='EXSLTPUBLIC'/>
+          <ref name='EXSLTPUBVAR'/>
+        </word>
         <word name='dynamic'>
           <ref name='EXSLT_DYNAMIC_NAMESPACE'/>
         </word>
       </letter>
       <letter name='e'>
+        <word name='exportable'>
+          <ref name='EXSLTPUBFUN'/>
+          <ref name='EXSLTPUBVAR'/>
+        </word>
+        <word name='exported'>
+          <ref name='EXSLTCALL'/>
+        </word>
         <word name='extension'>
           <ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
           <ref name='exsltSaxonRegister'/>
@@ -282,6 +305,7 @@
       </letter>
       <letter name='f'>
         <word name='for'>
+          <ref name='EXSLTCALL'/>
           <ref name='EXSLT_COMMON_NAMESPACE'/>
           <ref name='EXSLT_CRYPTO_NAMESPACE'/>
           <ref name='EXSLT_DATE_NAMESPACE'/>
@@ -296,7 +320,11 @@
           <ref name='exsltSetsXpathCtxtRegister'/>
           <ref name='exsltStrXpathCtxtRegister'/>
         </word>
+        <word name='function'>
+          <ref name='EXSLTPUBFUN'/>
+        </word>
         <word name='functions'>
+          <ref name='EXSLTCALL'/>
           <ref name='EXSLT_COMMON_NAMESPACE'/>
           <ref name='EXSLT_CRYPTO_NAMESPACE'/>
           <ref name='EXSLT_DATE_NAMESPACE'/>
@@ -336,6 +364,11 @@
           <ref name='exsltStrXpathCtxtRegister'/>
         </word>
       </letter>
+      <letter name='p'>
+        <word name='public'>
+          <ref name='EXSLTPUBLIC'/>
+        </word>
+      </letter>
       <letter name='s'>
         <word name='set'>
           <ref name='EXSLT_SETS_NAMESPACE'/>
@@ -343,6 +376,9 @@
         <word name='strings'>
           <ref name='EXSLT_STRINGS_NAMESPACE'/>
         </word>
+        <word name='symbol'>
+          <ref name='EXSLTPUBLIC'/>
+        </word>
       </letter>
       <letter name='u'>
         <word name='use'>
@@ -352,9 +388,22 @@
           <ref name='exsltStrXpathCtxtRegister'/>
         </word>
       </letter>
+      <letter name='v'>
+        <word name='variable'>
+          <ref name='EXSLTPUBVAR'/>
+        </word>
+      </letter>
+      <letter name='w'>
+        <word name='which'>
+          <ref name='EXSLTCALL'/>
+          <ref name='EXSLTPUBFUN'/>
+          <ref name='EXSLTPUBLIC'/>
+          <ref name='EXSLTPUBVAR'/>
+        </word>
+      </letter>
     </chunk>
     <chunks>
-      <chunk name='chunk0' start='C' end='u'/>
+      <chunk name='chunk0' start='C' end='w'/>
     </chunks>
   </index>
 </apirefs>
diff --git a/doc/devhelp/libxslt-xsltexports.html b/doc/devhelp/libxslt-xsltexports.html
index e9479ea1..dc9413df 100644
--- a/doc/devhelp/libxslt-xsltexports.html
+++ b/doc/devhelp/libxslt-xsltexports.html
@@ -40,13 +40,13 @@
     </h2>
     <p>xsltexports - macros for marking symbols as exportable/importable.</p>
     <p>macros for marking symbols as exportable/importable. </p>
-    <p>Author(s): Igor Zlatkovic &lt;igor@zlatkovic.com&gt; </p>
+    <p>Author(s): </p>
     <div class="refsynopsisdiv">
       <h2>Synopsis</h2>
       <pre class="synopsis">#define <a href="#LIBXSLT_PUBLIC">LIBXSLT_PUBLIC</a>;
 #define <a href="#XSLTPUBFUN">XSLTPUBFUN</a>;
 #define <a href="#XSLTPUBVAR">XSLTPUBVAR</a>;
-#define <a href="#_REENTRANT">_REENTRANT</a>;
+#define <a href="#XSLTPUBLIC">XSLTPUBLIC</a>;
 #define <a href="#XSLTCALL">XSLTCALL</a>;
 </pre>
     </div>
@@ -61,19 +61,19 @@
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="XSLTCALL">Macro </a>XSLTCALL</h3><pre class="programlisting">#define <a href="#XSLTCALL">XSLTCALL</a>;
-</pre><p/>
+</pre><p>Macro which declares the calling convention for exported functions</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="XSLTPUBFUN">Macro </a>XSLTPUBFUN</h3><pre class="programlisting">#define <a href="#XSLTPUBFUN">XSLTPUBFUN</a>;
-</pre><p/>
+</pre><p>Macro which declares an exportable function</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="XSLTPUBLIC">Macro </a>XSLTPUBLIC</h3><pre class="programlisting">#define <a href="#XSLTPUBLIC">XSLTPUBLIC</a>;
+</pre><p>Macro which declares a public symbol</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="XSLTPUBVAR">Macro </a>XSLTPUBVAR</h3><pre class="programlisting">#define <a href="#XSLTPUBVAR">XSLTPUBVAR</a>;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="_REENTRANT">Macro </a>_REENTRANT</h3><pre class="programlisting">#define <a href="#_REENTRANT">_REENTRANT</a>;
-</pre><p/>
+</pre><p>Macro which declares an exportable variable</p>
 </div>
         <hr/>
       </div>
diff --git a/doc/devhelp/libxslt.devhelp2 b/doc/devhelp/libxslt.devhelp2
index 4a44f803..40295fab 100644
--- a/doc/devhelp/libxslt.devhelp2
+++ b/doc/devhelp/libxslt.devhelp2
@@ -39,6 +39,7 @@
     <keyword type="macro" name="XML_CAST_FPTR" link="libxslt-xsltInternals.html#XML_CAST_FPTR"/>
     <keyword type="macro" name="XSLTCALL" link="libxslt-xsltexports.html#XSLTCALL"/>
     <keyword type="macro" name="XSLTPUBFUN" link="libxslt-xsltexports.html#XSLTPUBFUN"/>
+    <keyword type="macro" name="XSLTPUBLIC" link="libxslt-xsltexports.html#XSLTPUBLIC"/>
     <keyword type="macro" name="XSLTPUBVAR" link="libxslt-xsltexports.html#XSLTPUBVAR"/>
     <keyword type="macro" name="XSLT_CCTXT" link="libxslt-xsltInternals.html#XSLT_CCTXT"/>
     <keyword type="macro" name="XSLT_DEFAULT_URL" link="libxslt-xslt.html#XSLT_DEFAULT_URL"/>
@@ -81,7 +82,6 @@
     <keyword type="macro" name="XSLT_TRACE" link="libxslt-xsltutils.html#XSLT_TRACE"/>
     <keyword type="macro" name="XSLT_XALAN_NAMESPACE" link="libxslt-extra.html#XSLT_XALAN_NAMESPACE"/>
     <keyword type="macro" name="XSLT_XT_NAMESPACE" link="libxslt-extra.html#XSLT_XT_NAMESPACE"/>
-    <keyword type="macro" name="_REENTRANT" link="libxslt-xsltexports.html#_REENTRANT"/>
     <keyword type="enum" name="XSLT_DEBUG_CONT" link="libxslt-xsltutils.html#XSLT_DEBUG_CONT"/>
     <keyword type="enum" name="XSLT_DEBUG_INIT" link="libxslt-xsltutils.html#XSLT_DEBUG_INIT"/>
     <keyword type="enum" name="XSLT_DEBUG_NEXT" link="libxslt-xsltutils.html#XSLT_DEBUG_NEXT"/>
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 87335ae4..785eeafc 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -568,11 +568,10 @@
     <file name='xsltexports'>
      <summary>macros for marking symbols as exportable/importable.</summary>
      <description>macros for marking symbols as exportable/importable. </description>
-     <author>Igor Zlatkovic &lt;igor@zlatkovic.com&gt; </author>
      <exports symbol='LIBXSLT_PUBLIC' type='macro'/>
      <exports symbol='XSLTPUBFUN' type='macro'/>
      <exports symbol='XSLTPUBVAR' type='macro'/>
-     <exports symbol='_REENTRANT' type='macro'/>
+     <exports symbol='XSLTPUBLIC' type='macro'/>
      <exports symbol='XSLTCALL' type='macro'/>
     </file>
     <file name='xsltlocale'>
@@ -717,10 +716,16 @@
       <arg name='fptr' info='pointer to a function'/>
     </macro>
     <macro name='XSLTCALL' file='xsltexports'>
+      <info>Macro which declares the calling convention for exported functions</info>
     </macro>
     <macro name='XSLTPUBFUN' file='xsltexports'>
+      <info>Macro which declares an exportable function</info>
+    </macro>
+    <macro name='XSLTPUBLIC' file='xsltexports'>
+      <info>Macro which declares a public symbol</info>
     </macro>
     <macro name='XSLTPUBVAR' file='xsltexports'>
+      <info>Macro which declares an exportable variable</info>
     </macro>
     <macro name='XSLT_CCTXT' file='xsltInternals'>
       <info>get pointer to compiler context</info>
@@ -851,8 +856,6 @@
     <macro name='XSLT_XT_NAMESPACE' file='extra'>
       <info>This is James Clark&apos;s XT processor namespace for extensions.</info>
     </macro>
-    <macro name='_REENTRANT' file='xsltexports'>
-    </macro>
     <enum name='XSLT_DEBUG_CONT' file='xsltutils' value='6' type='xsltDebugStatusCodes'/>
     <enum name='XSLT_DEBUG_INIT' file='xsltutils' value='1' type='xsltDebugStatusCodes'/>
     <enum name='XSLT_DEBUG_NEXT' file='xsltutils' value='4' type='xsltDebugStatusCodes'/>
diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index 68a5aba5..5a285277 100644
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -15,6 +15,7 @@
     <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='XSLTPUBLIC' href='html/libxslt-xsltexports.html#XSLTPUBLIC'/>
     <reference name='XSLTPUBVAR' href='html/libxslt-xsltexports.html#XSLTPUBVAR'/>
     <reference name='XSLT_CCTXT' href='html/libxslt-xsltInternals.html#XSLT_CCTXT'/>
     <reference name='XSLT_DEBUG_CONT' href='html/libxslt-xsltutils.html#XSLT_DEBUG_CONT'/>
@@ -131,7 +132,6 @@
     <reference name='XSLT_TRACE_VARIABLES' href='html/libxslt-xsltutils.html#XSLT_TRACE_VARIABLES'/>
     <reference name='XSLT_XALAN_NAMESPACE' href='html/libxslt-extra.html#XSLT_XALAN_NAMESPACE'/>
     <reference name='XSLT_XT_NAMESPACE' href='html/libxslt-extra.html#XSLT_XT_NAMESPACE'/>
-    <reference name='_REENTRANT' href='html/libxslt-xsltexports.html#_REENTRANT'/>
     <reference name='_xsltCompMatch' href='html/libxslt-numbersInternals.html#_xsltCompMatch'/>
     <reference name='_xsltCompilerCtxt' href='html/libxslt-xsltInternals.html#_xsltCompilerCtxt'/>
     <reference name='_xsltCompilerNodeInfo' href='html/libxslt-xsltInternals.html#_xsltCompilerNodeInfo'/>
@@ -605,6 +605,7 @@
       <ref name='XML_CAST_FPTR'/>
       <ref name='XSLTCALL'/>
       <ref name='XSLTPUBFUN'/>
+      <ref name='XSLTPUBLIC'/>
       <ref name='XSLTPUBVAR'/>
       <ref name='XSLT_CCTXT'/>
       <ref name='XSLT_DEBUG_CONT'/>
@@ -723,7 +724,6 @@
       <ref name='XSLT_XT_NAMESPACE'/>
     </letter>
     <letter name='_'>
-      <ref name='_REENTRANT'/>
       <ref name='_xsltCompMatch'/>
       <ref name='_xsltCompilerCtxt'/>
       <ref name='_xsltCompilerNodeInfo'/>
@@ -2466,8 +2466,8 @@
       <ref name='LIBXSLT_PUBLIC'/>
       <ref name='XSLTCALL'/>
       <ref name='XSLTPUBFUN'/>
+      <ref name='XSLTPUBLIC'/>
       <ref name='XSLTPUBVAR'/>
-      <ref name='_REENTRANT'/>
     </file>
     <file name='xsltlocale'>
       <ref name='XSLT_LOCALE_NONE'/>
@@ -3030,6 +3030,10 @@
           <ref name='CHECK_STOPPED0'/>
           <ref name='CHECK_STOPPEDE'/>
           <ref name='XML_CAST_FPTR'/>
+          <ref name='XSLTCALL'/>
+          <ref name='XSLTPUBFUN'/>
+          <ref name='XSLTPUBLIC'/>
+          <ref name='XSLTPUBVAR'/>
           <ref name='XSLT_LOCALE_NONE'/>
           <ref name='XSLT_LOCALE_POSIX'/>
           <ref name='XSLT_LOCALE_WINAPI'/>
@@ -4207,6 +4211,9 @@
           <ref name='xsltXPathCompile'/>
           <ref name='xsltXPathCompileFlags'/>
         </word>
+        <word name='calling'>
+          <ref name='XSLTCALL'/>
+        </word>
         <word name='calls='>
           <ref name='xsltGetProfileInformation'/>
         </word>
@@ -4484,6 +4491,9 @@
         <word name='control'>
           <ref name='xslHandleDebugger'/>
         </word>
+        <word name='convention'>
+          <ref name='XSLTCALL'/>
+        </word>
         <word name='converts'>
           <ref name='xsltEvalTemplateString'/>
         </word>
@@ -4630,6 +4640,12 @@
           <ref name='xsltCheckExtURI'/>
           <ref name='xsltCopyNamespace'/>
         </word>
+        <word name='declares'>
+          <ref name='XSLTCALL'/>
+          <ref name='XSLTPUBFUN'/>
+          <ref name='XSLTPUBLIC'/>
+          <ref name='XSLTPUBVAR'/>
+        </word>
         <word name='declaring'>
           <ref name='xsltGetSpecialNamespace'/>
         </word>
@@ -5006,6 +5022,13 @@
         <word name='expect'>
           <ref name='xsltApplyOneTemplate'/>
         </word>
+        <word name='exportable'>
+          <ref name='XSLTPUBFUN'/>
+          <ref name='XSLTPUBVAR'/>
+        </word>
+        <word name='exported'>
+          <ref name='XSLTCALL'/>
+        </word>
         <word name='expressed'>
           <ref name='XSLT_PAT_NO_PRIORITY'/>
         </word>
@@ -5305,6 +5328,7 @@
           <ref name='xsltExtensionInstructionResultFinalize'/>
         </word>
         <word name='functions'>
+          <ref name='XSLTCALL'/>
           <ref name='XSLT_ITEM_COMPATIBILITY_FIELDS'/>
           <ref name='_xsltTransformContext'/>
           <ref name='xsltApplyOneTemplate'/>
@@ -6920,6 +6944,9 @@
           <ref name='xsltRunStylesheetUser'/>
           <ref name='xsltSecurityCheck'/>
         </word>
+        <word name='public'>
+          <ref name='XSLTPUBLIC'/>
+        </word>
         <word name='public?'>
           <ref name='xsltAttrTemplateValueProcessNode'/>
         </word>
@@ -7740,6 +7767,9 @@
         <word name='sure'>
           <ref name='xsltAllocateExtraCtxt'/>
         </word>
+        <word name='symbol'>
+          <ref name='XSLTPUBLIC'/>
+        </word>
         <word name='system'>
           <ref name='xsltNewLocale'/>
         </word>
@@ -8281,6 +8311,10 @@
           <ref name='xsltTestCompMatchList'/>
         </word>
         <word name='which'>
+          <ref name='XSLTCALL'/>
+          <ref name='XSLTPUBFUN'/>
+          <ref name='XSLTPUBLIC'/>
+          <ref name='XSLTPUBVAR'/>
           <ref name='XSLT_ITEM_COMPATIBILITY_FIELDS'/>
           <ref name='_xsltStackElem'/>
           <ref name='_xsltTransformContext'/>
diff --git a/doc/xsltproc.1 b/doc/xsltproc.1
index 85b7054d..15555cec 100644
--- a/doc/xsltproc.1
+++ b/doc/xsltproc.1
@@ -2,12 +2,12 @@
 .\"     Title: xsltproc
 .\"    Author: John Fleck <jfleck@inkstain.net>
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: $Date$
+.\"      Date: 08/17/2022
 .\"    Manual: xsltproc Manual
 .\"    Source: libxslt
 .\"  Language: English
 .\"
-.TH "XSLTPROC" "1" "$Date$" "libxslt" "xsltproc Manual"
+.TH "XSLTPROC" "1" "08/17/2022" "libxslt" "xsltproc Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------