diff --git a/xdocs/sources/xalan-jlocal.xml b/xdocs/sources/xalan-jlocal.xml
index 92c26f4..344a9f6 100644
--- a/xdocs/sources/xalan-jlocal.xml
+++ b/xdocs/sources/xalan-jlocal.xml
@@ -20,13 +20,13 @@
 
 <book title="Xalan XSL Transformer User's Guide" copyright="2005 The Apache Software Foundation">
   <resources source="sbk:/sources/xalan/resources.xml"/>
-  <document id="whatsnew" label="What's New" source="xalan/whatsnew.xml"/>
-  <document id="readme" label="Release Notes" source="xalan/readme.xml"/>  
+  <document id="whatsnew"    label="What's New"      source="xalan/whatsnew.xml"/>
+  <document id="readme"      label="Release Notes"   source="xalan/readme.xml"/>  
   <separator/>
-  <document id="overview" label="Overview" source="xalan/overview.xml"/>
-  <document id="downloads" label="Downloads" source="xalan/downloads.xml"/>  
-  <document id="getstarted" label="Getting Started" source="xalan/getstarted.xml"/>
-  <document id="xsltc_usage" label="Using XSLTC" source="xalan/xsltc_usage.xml"/>  
+  <document id="overview"    label="Overview"        source="xalan/overview.xml"/>
+  <document id="downloads"   label="Downloads/Code"       source="xalan/downloads.xml"/>  
+  <document id="getstarted"  label="Getting Started" source="xalan/getstarted.xml"/>
+  <document id="xsltc_usage" label="Using XSLTC"     source="xalan/xsltc_usage.xml"/>  
   <separator/>
   <faqs id="faq" label="FAQs" source="xalan/faq.xml"/>
   <separator/>
@@ -50,13 +50,12 @@
   <external href="design/design2_0_0.html" label="Xalan 2 Design"/>
   <external href="xsltc/index.html" label="XSLTC Design"/>
   <separator/>
-  <external href="http://cvs.apache.org/viewcvs.cgi/xml-xalan/java/" label="Source Repository"/>
   <document id="builds" label="Xalan-Java Builds" source="xalan/builds.xml"/>
   <external href="http://xml.apache.org/xalan-j/test/overview.html" label="Testing"/>
-  <external href="http://marc.theaimsgroup.com/?l=xalan-j-users" label="User Mail Archive"/>
-  <external href="http://marc.theaimsgroup.com/?l=xalan-dev " label="Dev Mail Archive"/>  
   <document id="bugreporting" label="Bug Reporting" source="xalan/bugreporting.xml"/>  
-  
+  <separator/>
+  <document id="contact_us"  label="Contact us"      source="xalan/contact_us.xml"/>  
   <hidden   id="history" source="xalan/history.xml"/>
   <hidden   id="xsltc_history" source="xalan/xsltc_history.xml"/>
+  
 </book>
diff --git a/xdocs/sources/xalan-jsite.xml b/xdocs/sources/xalan-jsite.xml
index 33270e5..12fde67 100644
--- a/xdocs/sources/xalan-jsite.xml
+++ b/xdocs/sources/xalan-jsite.xml
@@ -22,14 +22,14 @@
   <resources source="sbk:/sources/xalan/resources.xml"/>
   <external href="http://xalan.apache.org/index.html" label="Home"/>
   <separator/>
-  <document id="index" label="Xalan-J 2.7.0" source="xalan/index.xml"/>
+  <document id="index" label="Xalan-J 2.7.1" source="xalan/index.xml"/>
   <document id="charter" label="Charter" source="xalan/charter.xml"/>
   <separator/>  
   <document id="whatsnew" label="What's New" source="xalan/whatsnew.xml"/>
   <document id="readme" label="Release Notes" source="xalan/readme.xml"/>
   <separator/>
   <document id="overview" label="Overview" source="xalan/overview.xml"/>
-  <document id="downloads" label="Downloads" source="xalan/downloads.xml"/>  
+  <document id="downloads" label="Downloads/Code" source="xalan/downloads.xml"/>  
   <document id="getstarted" label="Getting Started" source="xalan/getstarted.xml"/>
   <document id="xsltc_usage" label="Using XSLTC" source="xalan/xsltc_usage.xml"/>   
   <separator/>
@@ -55,13 +55,11 @@
   <external href="design/design2_0_0.html" label="Xalan 2 Design"/>
   <external href="xsltc/index.html" label="XSLTC Design"/>  
   <separator/>
-  <external href="http://cvs.apache.org/viewcvs.cgi/xml-xalan/java/" label="Source Repository"/>
   <document id="builds" label="Xalan-Java Builds" source="xalan/builds.xml"/>
   <external href="http://xml.apache.org/xalan-j/test/overview.html" label="Testing"/>
-  <external href="http://marc.theaimsgroup.com/?l=xalan-j-users" label="User Mail Archive"/>
-  <external href="http://marc.theaimsgroup.com/?l=xalan-dev " label="Dev Mail Archive"/>
   <document id="bugreporting" label="Bug Reporting" source="xalan/bugreporting.xml"/>  
-      
+  <separator/>
+  <document id="contact_us" label="Contact us" source="xalan/contact_us.xml"/>      
   <hidden   id="history" source="xalan/history.xml"/>
   <hidden   id="xsltc_history" source="xalan/xsltc_history.xml"/>
 </book>
diff --git a/xdocs/sources/xalan/bugreporting.xml b/xdocs/sources/xalan/bugreporting.xml
index 316242e..9db30b0 100644
--- a/xdocs/sources/xalan/bugreporting.xml
+++ b/xdocs/sources/xalan/bugreporting.xml
@@ -26,8 +26,8 @@
   <li>To help eliminate duplicate or invalid bug reports, please take a quick look at
       bugs in JIRA to see whether the bug has been already reported and/or fixed. 
       You can also download the 
-      <jump href="http://vmgump.apache.org/gump/public-jars/xml-xalan2/">latest code</jump> 
-      in CVS and check if you can reproduce the bug.</li>
+      <link idref="downloads">latest code</link>
+      and check if you can reproduce the bug.</li>
   <li>Report bugs against the newest release.</li>
   <li>Read <jump href="http://issues.apache.org/jira">JIRA Notes</jump>.</li>
   </ul>
@@ -41,8 +41,20 @@
         but use the same e-mail account name and click on "Forgot Password" on the JIRA home page.</note>
   </s2>
   
+  <s2 title="Bugzilla is not used">
+    <p>
+      The old bug tracking system, bugzilla, is still available at
+      <resource idref="old-bugzilla"/> but please don't use bugzilla except to
+      look up old issues. Bugzilla has been replaced by JIRA.
+    </p>
+  </s2>
+  
   <s2 title="Report a bug">  
   <p>After reading the instructions above, click 
-     <jump href="http://issues.apache.org/jira/browse/XALANJ">here</jump> to submit a bug report.</p>
+     <jump href="http://issues.apache.org/jira/browse/XALANJ">here</jump> to submit a bug report using JIRA.</p>
+     Note that the functionality shown by the JIRA user interface changes depending on whether
+     you <em>Log In</em> or not. In particular, to have the <em>CREATE NEW ISSUE</em> link 
+     you will need to click the <em>Log In</em> in small font, in the top right corner
+     of the page.
   </s2>
 </s1>
diff --git a/xdocs/sources/xalan/builds.xml b/xdocs/sources/xalan/builds.xml
index a608f2b..6974aa4 100644
--- a/xdocs/sources/xalan/builds.xml
+++ b/xdocs/sources/xalan/builds.xml
@@ -49,7 +49,9 @@
   <p>The project's technical mailing list for all committers and developers 
   interested in the API and inner workings is 
   <jump href="mailto:xalan-dev@xml.apache.org">xalan-dev@xml.apache.org</jump>; 
-  it's a good idea to subscribe if you plan to work on &xslt4j;.  Logs of all CVS 
+  it's a good idea to 
+  <link idref="contact_us" anchor="dev-mailing-list">subscribe</link>
+  if you plan to work on &xslt4j;.  Logs of all Subversion 
   commits are automatically sent to <jump href="mailto:xalan-cvs@xml.apache.org">xalan-cvs@xml.apache.org</jump>, although 
   discussions should happen on xalan-dev.  You can read more <jump href="http://xml.apache.org/mail.html">about mailing lists.</jump></p>
   <p>&xslt4j; is a fairly mature project; one where most committers and many 
diff --git a/xdocs/sources/xalan/downloads.xml b/xdocs/sources/xalan/downloads.xml
index 2dd4eaa..4063a83 100644
--- a/xdocs/sources/xalan/downloads.xml
+++ b/xdocs/sources/xalan/downloads.xml
@@ -44,8 +44,7 @@
     <li>The second binary distribution, &xslt4j-dist-bin;-2jars.zip or &xslt4j-dist-bin;-2jars.tar.gz
       contains the Xalan Interpretive processor in xalan.jar, and the Xalan Compiled 
       processor (XSLTC) and the runtime support packages in xsltc.jar.  </li>
-  </ul>
-  <p>The binary distributions can be downloaded from the <resource-ref idref="xslt4j-distdir"/>.</p>
+  </ul>  
   <p>There is an optional source distribution available for doing your own &xslt4j; builds; see 
      <link idref="readme" anchor="build">Build notes</link>. You can download the source distribution from 
      the <resource-ref idref="xslt4j-distdir"/>.</p>     
@@ -55,18 +54,164 @@
      <jump href="http://jakarta.apache.org/bsf/index.html">Apache Jakarta
      BSF project</jump>. If you plan to run XSLT extensions implemented in scripting 
      languages, you will need bsf.jar and one or more additional files as indicated in 
-     <link idref="extensions" anchor="supported-lang">extensions language requirements</link>.</p>     
-  <p>To access previous releases, see the <resource-ref idref="xslt4j-distdir-previous"/>.</p>
+     <link idref="extensions" anchor="supported-lang">extensions language requirements</link>.
+  </p>
+</s2>
+<anchor name="previous-releases"/>
+<s2 title="Where do I download previous releases?">
+  <p>
+    To access previous releases, see the <resource-ref idref="xslt4j-distdir-previous"/>.
+  </p>
 </s2>
 <anchor name="whereis_xml4j"/>
 <s2 title="Where do I get &xml4j;?">
-<p>The &xslt4j; download includes &xml4j-jar; from &xml4j-used;. In conjunction with xml-apis.jar, 
-this is all you need to run &xslt4j; with the &xml4j; XML parser. You can, however, download the 
-complete &xml4j; binary or source distribution from the <resource-ref idref="xml4j-distdir"/>.
-If you cannot find &xml4j-used; at that location, have a look at the 
-<jump href="http://archive.apache.org/dist/xml/xerces-j/">Apache archive location for
-Xerces Java</jump>.</p>
+  <p>
+    The &xslt4j; download includes &xml4j-jar; from &xml4j-used;. In conjunction with xml-apis.jar, 
+    this is all you need to run &xslt4j; with the &xml4j; XML parser. You can, however, download the 
+    complete &xml4j; binary or source distribution from the <resource-ref idref="xml4j-distdir"/>.
+    If you cannot find &xml4j-used; at that location, have a look at the 
+    <jump href="http://archive.apache.org/dist/xml/xerces-j/">Apache archive location for
+    Xerces Java</jump>.
+  </p>
 <note>If you plan to use a different XML parser, see <link idref="usagepatterns" anchor="plug">Plugging 
 in a Transformer and XML parser</link>.</note> 
 </s2>
+
+<anchor name="gump"/>
+<s2 title="How do I download pre-built jars of the lastest code?">
+  <p>
+    If you want the latest development code but don't want to build it yourself, you can
+    download xalan.jar, serializer.jar, and xsltc.jar built from the latest development code at gump
+    from this link to the <jump href="http://vmgump.apache.org/gump/public-jars/xml-xalan/jars/">nightly gump builds</jump>.
+    You can download the lastest jars from the gump site
+    to check whether the problem still exists in the latest code. 
+    Note that the latest jars of interest at that site have the names with a time-stamp in the middle of their name.
+    These are nightly builds, use them an your own risk!  
+  </p>
+  
+  <p>
+    Gump is basically a meta-build system designed to do code extraction and Ant builds
+    of multiple projects simultaneously.  Luckily, Gump is a top-level project
+    that includes a complete set of
+    <jump href="http://gump.apache.org/">documentation</jump>.
+  </p> 
+  <p>
+    The Gump committers also provide a Gump service, which runs actual 
+    builds nightly of nearly all Apache's Java-based projects.  The 
+    <jump href="http://gump.apache.org/">results</jump> of nightly builds and
+    jar files for &xslt4j; (when the build succeeds) are posted daily.
+  </p>
+  <p>Note: nightly builds are just that - automated builds run nightly,
+     without human intervention.
+  </p>
+</s2>
+
+<anchor  name="viewcode"/>
+<s2 title="How do I view Xalan code in a browser?">
+  <p>
+    If you wish to view some of Xalan's files in a browser without downloading the
+    whole project you can view it at
+    <jump href="http://svn.apache.org/viewvc/xalan/">http://svn.apache.org/viewvc/xalan/</jump>
+    or at
+    <jump href="http://svn.apache.org/repos/asf/xalan/">http://svn.apache.org/repos/asf/xalan/</jump>.  
+    The link with "viewvc" in it is slightly prettier.
+  </p>
+  <p>
+    The java/trunk and test/trunk subdirectories are the ones with the latest development code.  
+  </p>
+</s2>
+
+<anchor name="buildmyself"/>
+<s2 title="How do I download the latest development code to build myself?">
+  <p>
+    If you wish to download Xalan and build it yourself, perhaps because you want to 
+    apply a patch and test it, you will need a subversion client and anonymous access
+    to the repository.
+    Don't worry, everyone has anonymous access.
+    You can find pre-built binaries of subversion clients for different
+    operating systems here:
+    <jump href="http://subversion.tigris.org/project_packages.html#binary-packages">
+    http://subversion.tigris.org/project_packages.html#binary-packages</jump>.
+    See 
+    <jump href="http://www.apache.org/dev/version-control.html">
+    http://www.apache.org/dev/version-control.html
+    </jump> for more information on Apache and subversion.    
+  </p>
+  <p>
+    Once the subverion client is installed on your local machine you
+    can use the command line client program <code>svn</code>
+    to get the latest Xalan-J using a command line something like this:
+    <source>
+    svn checkout http://svn.apache.org/repos/asf/xalan/java/trunk java    
+    </source>
+    where the argument after <code>checkout</code> is the Subversion repository location,
+    in this case the location of the latest development code, and the last argument,
+    in this case <code>java</code> is the location of the local directory that the repository is
+    copied to.   
+  </p>
+  <p>
+    Similarly for the test harness, you can download the latest test harness with a Subversion command
+    something like this:
+    <source>
+    svn checkout http://svn.apache.org/repos/asf/xalan/test/trunk test    
+    </source>  
+  </p>
+  <p>
+    Those two commands will put a copy of the latest parts in the local
+    directories <code>java</code> and <code>test</code>,
+    which are sibling directories.  If you
+    want to test your build with
+    the test harness provided with Xalan then it is easiest if you keep the
+    local directory names
+    as suggested. With your paths set up to compile Java code, go into the local <code>java</code>
+    directory and issue these two commands:
+    <source>
+  build clean
+  build  
+  </source>
+  Other useful targets may be <code>xsltc.jar</code> or <code>serializer.jar</code>.
+  If you want to test the jars you just built in the directory <code>java/build</code>, change to
+  directory <code>test</code> and issue this command:
+  <source>
+  build jar
+  build smoketest
+    </source>
+    The first target, <code>jar</code> builds the test harness and only needs to be done
+    once after the <code>test</code> repository is checked out. The second target, <code>smoketest</code>,
+    runs the Xalan-J intepretive smoketest. 
+    Running the <code>build smoketest</code> or other targets in the <code>test</code> directory
+    automatically looks for the jars in the directory <code>../java/build</code>
+    and that is why it is easiest to download the projects into suggested sibling
+    directories with the given names.
+  </p>
+  <p>
+    Towards the end of the console output you will see <em>two CONGRATULATIONS!</em> messages if all
+    goes well. The end of the console output should look like this:
+    <source>
+    .
+    .
+    .
+minitest-pass:
+     [echo]  [minitest] CONGRATULATIONS! The Minitest passed!
+     [echo]  [minitest] See details in smoketest/Minitest.xml
+
+smoketest-notpass:
+
+smoketest-pass:
+     [echo]  [minitest] CONGRATULATIONS! The Smoketest passed!
+     [echo]  [minitest] Details are in smoketest/results-conf.xml, smoketest/results-api.xml, smoketest/extensions/results-extensions.xml
+
+smoketest:
+
+BUILD SUCCESSFUL
+Total time: 2 minutes 4 seconds
+build completed! 
+    </source>
+  </p>
+  <p>
+    Don't be fooled by the <em>BUILD SUCCESSFUL</em> messages, look for the two CONGRATULATIONS!
+    messages. If you run the smoketest for XSLTC with <code>build smoketest.xsltc</code> you wil
+    only get one CONGRATULATIONS! message if all goes well.
+  </p>  
+</s2>
 </s1>
diff --git a/xdocs/sources/xalan/extensionslib.xml b/xdocs/sources/xalan/extensionslib.xml
index 414d5e4..7701e21 100644
--- a/xdocs/sources/xalan/extensionslib.xml
+++ b/xdocs/sources/xalan/extensionslib.xml
@@ -236,8 +236,7 @@
 <note>If you want to use the NodeInfo extension elements, you MUST set the TransformerFactory 
 <link idref="features" anchor="source_location">source_location</link> attribute to true. 
 You can use the <link idref="commandline">command-line utility</link> -L flag or the 
-<jump href="apidocs/javax/xml/transform/TransformerFactory.html#setAttribute(java.lang.String, 
-java.lang.Object)">TransformerFactory.setAttribute()</jump> method to set this attribute.</note>
+<jump href="apidocs/javax/xml/transform/TransformerFactory.html#setAttribute(java.lang.String, java.lang.Object)">TransformerFactory.setAttribute()</jump> method to set this attribute.</note>
 
 <anchor name="systemid"/>
 <s3 title="systemId">
diff --git a/xdocs/sources/xalan/faq.xml b/xdocs/sources/xalan/faq.xml
index 76dadc9..57b9755 100644
--- a/xdocs/sources/xalan/faq.xml
+++ b/xdocs/sources/xalan/faq.xml
@@ -104,6 +104,20 @@
 &lt;/xsl:stylesheet&gt;</source>
       </a>
     </faq>
+    <faq title='Determining the Serializer Version'>
+      <q>How do I see what version of the Serializer I'm running? </q>
+      <a>
+          <anchor name='serlializercheck' />          
+        <p>
+          Xalan's serialier is now shared with Xerces. It may be packaged in Xalan, or Xerces,
+          or in the JRE itself. You can run the serializer's <em>Version</em> utility from the command line as follows:
+        </p>
+        <p>
+          <code>java org.apache.xml.serializer.Version</code>
+        </p>
+        The output should indicate which serializer you are using.
+      </a>
+    </faq>
     <faq title='Which version of Xerces should I be using?'>
       <q>Which version of &xml4j; should I be using?</q>
       <a>
@@ -173,7 +187,7 @@
       <q>I got java.lang.IllegalAccessError running &xslt4j; on Tomcat with JDK 1.4.</q>
       <a>
         <p><anchor name='tomcat'/></p>
-        <p><jump href="http://jakarta.apache.org/tomcat/index.html">jakarta-tomcat 4.1.*</jump> is packed
+        <p><jump href="http://tomcat.apache.org/index.html">jakarta-tomcat 4.1.*</jump> is packed
            with an old version of xercesImpl.jar. Based on the <resource-ref idref='endorsed' />, you should
            replace it with the newer xercesImpl.jar. You should add a newer xalan.jar and serializer.jar 
            to Tomcat as well.  
@@ -221,7 +235,7 @@
         should be able to 'verify the signature' of the .sig file, which basically verifies that the 
         corresponding .zip or tar.gz file has not been changed since we signed it.</p>
         <p>The PGP key can be found in 
-        <jump href='http://cvs.apache.org/viewcvs.cgi/xml-xalan/java/KEYS'>CVS.</jump></p>
+        <jump href='http://svn.apache.org/viewvc/xalan/java/trunk/KEYS'>KEYS.</jump></p>
       </a>
     </faq>
   </group>
@@ -342,7 +356,7 @@
   javax.xml.parsers.SAXParserFactory.newInstance();
 spFactory.setNamespaceAware(true);</source>
         <note>For more information about setting the namespaceAware property, and SAX2 vs. JAXP default 
-              settings, see <jump href='http://xml.apache.org/~edwingo/jaxp-faq.html#nsDefaults'>JAXP FAQ: 
+              settings, see <jump href='http://people.apache.org/~edwingo/jaxp-faq.html#nsDefaults'>JAXP FAQ: 
               Warning about namespace processing defaults</jump>.
         </note>
       </a>
@@ -612,7 +626,14 @@
         <p>If you want to use the stylesheet output encoding, do not use StreamResult(java.io.Writer) 
            to instantiate the holder for the output. Alternatively, you can specify the encoding when 
            you create a Writer (java.io.OutputStreamWriter). Once the Writer exists, you cannot change 
-           its encoding.</p>
+           its encoding. If the transformation is run in a servlet, it is possible
+           that the Writer is coming from the ServletResponse object.
+        </p>
+        <p>
+          If the stylesheet is run using the JAXP APIs and the Transformer's setOutputProperty() 
+          method is invoked, it is possible to set the <em>"encoding"</em> property and
+          over-ride the value in the stylesheet.
+        </p>
       </a>
     </faq>
     <faq title='Getting line and column numbers for errors in XML input documents and XSL stylesheets'>
diff --git a/xdocs/sources/xalan/history.xml b/xdocs/sources/xalan/history.xml
index 3581110..7a9825b 100644
--- a/xdocs/sources/xalan/history.xml
+++ b/xdocs/sources/xalan/history.xml
@@ -5077,7 +5077,7 @@
      anchor="classpath">Setting up the system class path</link>.</p>
      <p>Beginning with this release, we are shipping two distribution files; a binary
      distribution file, which includes everything needed to run &xslt4j; and build applications, and a source distribution. For
-     more information, see <link idref="getstarted" anchor="download">Downloading what you need</link>.</p>
+     more information, see <link idref="downloads">Downloading what you need</link>.</p>
      <p>This release also includes <link idref="samples" anchor="validatexmlinput">ValidateXMLInput</link>, a sample that illustrates 
      how you can verify that the XML input you are transforming adheres to its document type. It is in the samples/validate subdirectory
      along with a Validate utility that you can use to validate XML files without performing a transformation.</p>     
@@ -6077,7 +6077,7 @@
 
 <p>As a result of the changes in *internal* api, you may encounter problems with extensions. We have done some bug fixing in support
 for extensions since 2.2.D1.  John Gentilin is working on fixing the SQL library extension,which currently is broken. Please report 
-any problems you find (see <link anchor="bugs">bugs</link>).</p>
+any problems you find (see <link idref="jira">bugs</link>).</p>
 
 <p>The DTM and related work provides faster performance and less accumulation of garbage... though it is an
 ongoing battle.  Brief summary:</p>
@@ -6359,10 +6359,10 @@
 <s2 title="Changes for &xslt4j; 2.0.1">
 <p>This release includes a number of bug fixes to the &xslt4j; and TrAX core and Xalan-Java 1 compability API. We have also</p>
 <ul>
-  <li>Entered all known &xslt4j; 2 <link anchor="bugs">bugs</link> in the Apache Bugzilla database<br/><br/></li>
+  <li>Entered all known &xslt4j; 2 <link idref="jira">bugs</link> in the Apache Bugzilla database<br/><br/></li>
   <li>Added support for using custom URIResolver, EntityResolver, and ContentHandler implementations with the <link
       idref="commandline">command-line utility</link><br/><br/></li> 
-  <li>Upgraded from Ant 1.2 to Ant 1.3 for our <link anchor="build">builds</link> (the new ant.jar is in the bin directory).</li>
+  <li>Upgraded from Ant 1.2 to Ant 1.3 for our <link idref="builds">builds</link> (the new ant.jar is in the bin directory).</li>
 </ul>
 <p>Core source code updates:</p>
 <ul>
@@ -6699,7 +6699,7 @@
    <li>Fixed null pointer exception that could occur with getValue("xxx").<br/><br/></li>
    <li>Fixed bug reported by Tim Sean handling the xml:space attribute.</li>
 </ul>
-<p><em>Bug fixes in the <link idref="usagepatterns" anchor="compat">Xalan-Java 1 compatibility API</link>:</em></p>
+<p><em>Bug fixes in the Xalan-Java 1 compatibility API:</em></p>
 <ul>
   <li>Fixed ProblemListener (for processing error messages) to derive from &xslt4j; 2 ErrorHandler.<br/><br/></li>
   <li>Fixed evaluation of stylesheet string parameters to conform to &xslt4j; 1 behavior (expressions for &xslt4j; 1 vs. String objects 
diff --git a/xdocs/sources/xalan/index.xml b/xdocs/sources/xalan/index.xml
index 55b8c0f..7aec254 100644
--- a/xdocs/sources/xalan/index.xml
+++ b/xdocs/sources/xalan/index.xml
@@ -48,7 +48,7 @@
 <anchor name="current"/>
 <s2 title="How about this release?">
   <p>This release includes new features as well as a number of bug fixes. See the 
-  <link idref="whatsnew" anchor="done">What's New</link> and <link idref="readme" anchor="done">Release 
+  <link idref="whatsnew">What's New</link> and <link idref="readme" anchor="done">Release 
   Notes</link> for more details.</p>
   <p>&xslt4j-current; works with &xml4j;, and the distribution includes xercesImpl.jar from &xml4j-used;.</p>
   <p>The &xslt4j; implementation is in xalan.jar and serializer.jar. 
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index 833ef20..7cf1d81 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -24,20 +24,103 @@
  <ul>
   <li><link anchor="status0">Status</link></li>
   <li><link anchor="build">Build distributions and notes</link></li>
-  <li><link anchor="contact">Getting in touch</link></li>
+  <li><link idref="contact_us">Getting in touch</link></li>
   <li><link idref="history">History of software changes</link></li>
- </ul><anchor name="status0"/>
+ </ul>
+ 
+  <anchor name="status0"/>
   <s2 title="Status">
    <ul>
-    <li><link anchor="done">Changes since version 2.6.0</link></li>
+    <li><link anchor="done">Changes in version 2.7.1</link></li>
     <li><link anchor="other">Other points of interest</link></li>
     <li><link anchor="status">Version of &xml4j; to use</link></li>
 <!-- <li><link anchor="developer-list">&xslt4j; developers</link></li> -->
    </ul>
-     <anchor name="done"/>
-   <s3 title="Changes since &xslt4j; 2.6.0">
-     <p>&xslt4j; 2.6.0 contains the following functional enhancements, performance enhancements and 
-        bug fixes:</p>
+   
+   <anchor name="done"/>
+   <s3 title="Changes in &xslt4j; 2.7.1">
+     <p>
+       &xslt4j; 2.7.1 contains the following functional enhancements, 
+       performance enhancements and bug fixes since 2.7.0:
+     </p>
+     <ul>
+     <li>Support for DOM Level 3 APIs for store.</li>
+     <li>Upgrade to Xerces-J (2.9.0) and a new version of xml-commons (xml-commons-external-1.3.04).</li>
+     <li>XALANJ Jira bug fixes:
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-611">611</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1324">1324</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1497">1497</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1706">1706</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-1753">1753</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2061">2061</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2091">2091</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2133">2133</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2159">2159</jump>,       
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2184">2184</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2196">2196</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2199">2199</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2204">2204</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2205">2205</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2206">2206</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2208">2208</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2209">2209</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2210">2210</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2217">2217</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2218">2218</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2219">2219</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2220">2220</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2221">2221</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2220">2222</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2224">2224</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2219">2219</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2230">2230</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2236">2236</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2240">2240</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2249">2249</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2268">2268</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2269">2269</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2271">2271</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2275">2275</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2276">2276</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2277">2277</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2278">2278</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2279">2279</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2271">2281</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2283">2283</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2284">2284</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2285">2285</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2286">2286</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2290">2290</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2292">2292</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2293">2293</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2294">2294</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2295">2295</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2297">2297</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2298">2298</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2307">2307</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2312">2312</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2316">2316</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2317">2317</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2318">2318</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2319">2319</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2321">2321</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2323">2323</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2324">2324</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2329">2329</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2336">2336</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2337">2337</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2341">2341</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2342">2342</jump>,
+       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2343">2343</jump>
+     </li>
+     </ul>
+   </s3>
+   
+   <anchor name="270"/>
+   <s3 title="Changes in &xslt4j; 2.7.0">
+     <p>&xslt4j; 2.7.0 contains the following functional enhancements, performance enhancements and 
+        bug fixes since 2.6.0:
+     </p>
      <ul>
      <li>Support for JAXP 1.3, including new default error handling behaviour.</li>
      <li>Support for XML 1.1 and Namespaces in XML 1.1.</li>
@@ -50,28 +133,28 @@
      <li>Upgrade to Xerces-J (2.7.1) and a new version of xml-commons (xml-commons-external-1.3.02).</li>
 
      <li>Bugzilla fixes:
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15333">15333</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27417">27417</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27516">27516</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27522">27522</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27539">27539</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27932">27932</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28082">28082</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28435">28435</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28622">28622</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28796">28796</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28879">28879</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29120">29120</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29234">29234</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29372">29372</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29411">29411</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29655">29655</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29706">29706</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=30056">30056</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=30142">30142</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=30262">30262</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=30301">30301</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=30658">30658</jump>
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15333">15333</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27417">27417</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27516">27516</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27522">27522</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27539">27539</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=27932">27932</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28082">28082</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28435">28435</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28622">28622</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28796">28796</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=28879">28879</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29120">29120</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29234">29234</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29372">29372</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29411">29411</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29655">29655</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=29706">29706</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30056">30056</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30142">30142</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30262">30262</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30301">30301</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=30658">30658</jump>
      </li>
      <li>XALANJ Jira bug fixes:
       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-936">936</jump>,     
@@ -170,7 +253,7 @@
       <jump href="http://issues.apache.org/jira/secure/ViewIssue.jspa?key=XALANJ-2183">2183</jump>
      </li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-      <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.
+      <resource-ref idref="apache-mail-archive" />.
      </li>
      <li>For more details on the new features of this release, please see the <link idref="whatsnew">What's New</link>  
          page.</li>     
@@ -178,9 +261,9 @@
    </s3>
      
      
-   <s3 title="Changes since &xslt4j; 2.5.2">
+   <s3 title="Changes in &xslt4j; 2.6.0">
      <p>&xslt4j; 2.6.0 contains the following functional enhancements, performance enhancements and 
-        bug fixes:</p>
+        bug fixes since 2.5.2:</p>
      <ul>
      <li>Improvement in translet initialization time.</li>
      <li>Addition of a translet versioning mechanism.  If the translet version
@@ -189,14 +272,14 @@
      <li>Changes that allow XSLTC to use other DTM implementations.</li>
      <li>Changes in the XML Serializer.  The serializer will no longer put a newline after
          the xml header tag unless indent="yes". See bugzilla 
-         <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24304">24304</jump>.</li>     
+         <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24304">24304</jump>.</li>     
      <li>Rename of Xalan Java's xalan:doc-cache-off processing instruction to 
          xalan-doc-cache-off.  This change was necessary due to a recent
          change in Xerces.  Xerces has started detecting the Namespace 
          well-formedness rule that a processing instruction's PITarget must not contain 
          a colon. The old-style PI (xalan:doc-cache-off) will be accepted provided that
          the XML parser does not report it as an error.  See bugzilla 
-         <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26217">26217</jump>.</li>
+         <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26217">26217</jump>.</li>
      <li>Enhancement to XSLTC's URIResolvers and the general mechanism to resolve relative URIs.
          XSLTC is now compatible with Xalan Intepretive.</li>
      <li>Addition of a TransformThread sample that demonstrates how to use different transformers
@@ -205,179 +288,181 @@
      <li>Elimination of "enum" as a name to allow compilation under JDK 1.5</li>   
         
      <li>Bugzilla fixes:     
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=797">797</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1396">1396</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5761">5761</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15140">15140</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16889">16889</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18351">18351</jump>, 
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19194">19194</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19464">19464</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22376">22376</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23046">23046</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23591">23591</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24278">24278</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24111">24111</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24187">24187</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24188">24188</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24302">24302</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24304">24304</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24365">24365</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24414">24414</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24518">24518</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24695">24695</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24728">24728</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24788">24788</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24793">24793</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24958">24958</jump>, 
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24979">24979</jump>,           
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24985">24985</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24988">24988</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25368">25368</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25416">25416</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25442">25442</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25449">25449</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25816">25816</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25924">25924</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26019">26019</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26030">26030</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26075">26075</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26169">26169</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26217">26217</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26697">26697</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26742">26742</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26829">26829</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26842">26842</jump>                                                                       
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=797">797</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=1396">1396</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5761">5761</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15140">15140</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16889">16889</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18351">18351</jump>, 
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19194">19194</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19464">19464</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22376">22376</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23046">23046</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23591">23591</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24278">24278</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24111">24111</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24187">24187</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24188">24188</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24302">24302</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24304">24304</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24365">24365</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24414">24414</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24518">24518</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24695">24695</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24728">24728</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24788">24788</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24793">24793</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24958">24958</jump>, 
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24979">24979</jump>,           
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24985">24985</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24988">24988</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25368">25368</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25416">25416</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25442">25442</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25449">25449</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25816">25816</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25924">25924</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26019">26019</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26030">26030</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26075">26075</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26169">26169</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26217">26217</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26697">26697</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26742">26742</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26829">26829</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=26842">26842</jump>                                                                       
      </li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-      <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.
+      <resource-ref idref="apache-mail-archive" />.
      </li>         
      </ul>
-   </s3>      
-   <s3 title="Changes since &xslt4j; 2.5.1">
-     <p>&xslt4j; 2.5.2 contains bug fixes and performance enhancements.</p>
+   </s3>   
+   
+      
+   <s3 title="Changes in &xslt4j; 2.5.2">
+     <p>&xslt4j; 2.5.2 contains bug fixes and performance enhancements since 2.5.1.</p>
       <p>Fixes in this release include the following: </p>
      <ul>
      <li>
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=782">782</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=788">788</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=789">789</jump>, 
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=795">795</jump>,                
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=890">890</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3415">3415</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5133">5133</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5972">5972</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6155">6155</jump>, 
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7205">7205</jump>,           
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7408">7408</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10900">10900</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11414">11414</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12441">12441</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13082">13082</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14149">14149</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14607">14607</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15090">15090</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15327">15327</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15700">15700</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15828">15828</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15901">15901</jump>,            
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16311">16311</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16512">16512</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16675">16675</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17630">17630</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18821">18821</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18907">18907</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19297">19297</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19591">19591</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19770">19770</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19823">19823</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19890">19890</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19918">19918</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19972">19972</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19973">19973</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20074">20074</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20114">20114</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20256">20256</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20537">20537</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20572">20572</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20625">20625</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20685">20685</jump>,            
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20795">20795</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20819">20819</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20832">20832</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20841">20841</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20909">20909</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20913">20913</jump>, 
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20920">20920</jump>,     
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21039">21039</jump>,   
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21048">21048</jump>,         
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21087">21087</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21300">21300</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21309">21309</jump>,   
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21449">21449</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21452">21452</jump>,               
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21471">21471</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21478">21478</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21491">21491</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21697">21697</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21713">21713</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21805">21805</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21893">21893</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22025">22025</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22115">22115</jump>,   
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22167">22167</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22342">22342</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22422">22422</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22438">22438</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22623">22623</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22769">22769</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22777">22777</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22808">22808</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22880">22880</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23200">23200</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23113">23113</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23115">23115</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23271">23271</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23418">23418</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23706">23706</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23812">23812</jump>,   
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23896">23896</jump>,   
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23983">23983</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24013">24013</jump>,      
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24025">24025</jump>      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=782">782</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=788">788</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=789">789</jump>, 
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=795">795</jump>,                
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=890">890</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=3415">3415</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5133">5133</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5972">5972</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6155">6155</jump>, 
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7205">7205</jump>,           
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7408">7408</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10900">10900</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11414">11414</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12441">12441</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13082">13082</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14149">14149</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14607">14607</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15090">15090</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15327">15327</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15700">15700</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15828">15828</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15901">15901</jump>,            
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16311">16311</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16512">16512</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16675">16675</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17630">17630</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18821">18821</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18907">18907</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19297">19297</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19591">19591</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19770">19770</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19823">19823</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19890">19890</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19918">19918</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19972">19972</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19973">19973</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20074">20074</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20114">20114</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20256">20256</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20537">20537</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20572">20572</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20625">20625</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20685">20685</jump>,            
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20795">20795</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20819">20819</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20832">20832</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20841">20841</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20909">20909</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20913">20913</jump>, 
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20920">20920</jump>,     
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21039">21039</jump>,   
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21048">21048</jump>,         
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21087">21087</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21300">21300</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21309">21309</jump>,   
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21449">21449</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21452">21452</jump>,               
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21471">21471</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21478">21478</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21491">21491</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21697">21697</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21713">21713</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21805">21805</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21893">21893</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22025">22025</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22115">22115</jump>,   
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22167">22167</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22342">22342</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22422">22422</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22438">22438</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22623">22623</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22769">22769</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22777">22777</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22808">22808</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22880">22880</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23200">23200</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23113">23113</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23115">23115</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23271">23271</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23418">23418</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23706">23706</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23812">23812</jump>,   
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23896">23896</jump>,   
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=23983">23983</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24013">24013</jump>,      
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24025">24025</jump>      
      </li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-      <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.
+      <resource-ref idref="apache-mail-archive" />.
      </li>         
      </ul>
    </s3>       
-   <s3 title="Changes since &xslt4j; 2.5.0">
-     <p>&xslt4j; 2.5.1 contains bug fixes and performance enhancements.</p>
+   <s3 title="Changes in &xslt4j; 2.5.1">
+     <p>&xslt4j; 2.5.1 contains bug fixes and performance enhancements since 2.5.0.</p>
       <p>Fixes in this release include the following: </p>
      <ul>
      <li>
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15200">15200</jump>,     
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18585">18585</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18926">18926</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19029">19029</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19388">19388</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19471">19471</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19474">19474</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19522">19522</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19640">19640</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19900">19900</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19960">19960</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20237">20237</jump>,
-      <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=20273">20273</jump>
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15200">15200</jump>,     
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18585">18585</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18926">18926</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19029">19029</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19388">19388</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19471">19471</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19474">19474</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19522">19522</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19640">19640</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19900">19900</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19960">19960</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20237">20237</jump>,
+      <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20273">20273</jump>
      </li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-      <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.
+      <resource-ref idref="apache-mail-archive" />.
      </li>         
      </ul>
    </s3>
-     <s3 title="Changes since &xslt4j; 2.5.D1">
+     <s3 title="Changes in &xslt4j; 2.5.0">
      <p>&xslt4j; 2.5.0 contains a variety of features, bug fixes and 
-        performance enhancements.</p>
+        performance enhancements since 2.5.D1.</p>
      <p>New features in &xslt4j; 2.5.0 include:
         <ul>
         <li>integration of the Document Table Model (DTM) with the XSLTC 
@@ -392,59 +477,60 @@
         and <link idref="history">History of software changes</link> for a list of the various 
         bug fixes and other enhancements in this release.</p>
      </s3>
-     <s3 title="Changes since &xslt4j; 2.4.1">
-     <p>This developer's release, Xalan-Java 2.5.D1, is primarily for the purpose of releasing 
+     <s3 title="Changes in &xslt4j; 2.5.D1">
+     <p>This developer's release, Xalan-Java 2.5.D1, has changes since 2.4.1 and
+        is primarily for the purpose of releasing 
         various bug fixes to the community.  These will eventually be released officially in 
         a future Xalan-Java 2.5 version, along with some new function.</p>
      <p>Fixes in this release include the following: </p>
      <ul>
-     <li><jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4858">4858</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5140">5140</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6075">6075</jump>,        
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6157">6157</jump>,   
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10053">10053</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10626">10626</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12481">12481</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13414">13414</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13651">13651</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13774">13774</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13775">13775</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13977">13977</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14112">14112</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14148">14148</jump>,               
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14157">14157</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14178">14178</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14229">14229</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14236">14236</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14237">14237</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14241">14241</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14244">14244</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14300">14300</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14322">14322</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14324">14324</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14365">14365</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14368">14368</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14406">14406</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14578">14578</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14753">14753</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14856">14856</jump>,               
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14862">14862</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14965">14965</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15074">15074</jump>,               
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15094">15094</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15218">15218</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15254">15254</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15373">15373</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15586">15586</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16745">16745</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17030">17030</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17136">17136</jump></li>
+     <li><jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=4858">4858</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5140">5140</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6075">6075</jump>,        
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6157">6157</jump>,   
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10053">10053</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10626">10626</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12481">12481</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13414">13414</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13651">13651</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13774">13774</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13775">13775</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13977">13977</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14112">14112</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14148">14148</jump>,               
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14157">14157</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14178">14178</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14229">14229</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14236">14236</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14237">14237</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14241">14241</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14244">14244</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14300">14300</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14322">14322</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14324">14324</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14365">14365</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14368">14368</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14406">14406</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14578">14578</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14753">14753</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14856">14856</jump>,               
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14862">14862</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14965">14965</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15074">15074</jump>,               
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15094">15094</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15218">15218</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15254">15254</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15373">15373</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=15586">15586</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=16745">16745</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17030">17030</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=17136">17136</jump></li>
      <li>Support for and bundling of Xerces Java 2.3.</li>     
      <li>Support for and bundling of xml-apis.jar from the tck-jaxp-1_2_0 branch of xml-commons.
          This version of the Java APIs for XML Processing successfully passes the JAXP 1.1 and 
          JAXP 1.2 TCKs.</li>     
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-     <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.</li>         
+     <resource-ref idref="apache-mail-archive" />.</li>         
      </ul>     
      </s3>     
      <s3 title="Changes since &xslt4j; 2.4.0">
@@ -485,103 +571,103 @@
      <li>Fixed a limitation for XPath expressions. The token queue and operations map can now grow
       to accomodate really large XPath expressions.</li>
      <li>Fixes for the following bugzilla defects: 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4344">4344</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5046">5046</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6181">6181</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6927">6927</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7161">7161</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7357">7357</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8175">8175</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8473">8473</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8939">8939</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9731">9731</jump>,                              
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9959">9959</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10176">10176</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10384">10384</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10414">10414</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10643">10643</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11073">11073</jump>,                         
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11341">11341</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11661">11661</jump>,     
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11743">11743</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11809">11809</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12077">12077</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12127">12127</jump>,                         
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12298">12298</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12687">12687</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13059">13059</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13303">13303</jump>,               
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13305">13305</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13106">13106</jump>,   
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13501">13501</jump>,            
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13711">13711</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13754">13754</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13863">13863</jump>,          
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13944">13944</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14022">14022</jump></li> 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=4344">4344</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5046">5046</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6181">6181</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6927">6927</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7161">7161</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7357">7357</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8175">8175</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8473">8473</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8939">8939</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9731">9731</jump>,                              
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9959">9959</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10176">10176</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10384">10384</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10414">10414</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10643">10643</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11073">11073</jump>,                         
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11341">11341</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11661">11661</jump>,     
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11743">11743</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11809">11809</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12077">12077</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12127">12127</jump>,                         
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12298">12298</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12687">12687</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13059">13059</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13303">13303</jump>,               
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13305">13305</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13106">13106</jump>,   
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13501">13501</jump>,            
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13711">13711</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13754">13754</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13863">13863</jump>,          
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13944">13944</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=14022">14022</jump></li> 
      <li>Support for and bundling of Xerces Java 2.2.</li>
      <li>Support for and bundling of xml-apis.jar from the factoryfinder-build of the RIVERCOURT1 branch of xml-commons.  This version of the Java
      APIs for XML Processing successfully passes the JAXP 1.1 and JAXP 1.2 TCKs.</li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-     <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.</li>
+     <resource-ref idref="apache-mail-archive" />.</li>
      <li>Support building Xalan with JDK 1.4.</li>
      </ul>
      </s3>
      <s3 title="Changes since &xslt4j; 2.3.1">
      <ul>
-     <li>Fixes for the following bugzilla defects: 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3238">3238</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=4603">4603</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5013">5013</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5016">5016</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5941">5941</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6071">6071</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6268">6268</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6284">6284</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6356">6356</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6547">6547</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6798">6798</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6833">6833</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6925">6925</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6972">6972</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7023">7023</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7118">7118</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7123">7123</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7157">7157</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7410">7410</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7776">7776</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8324">8324</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8358">8358</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8551">8551</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=8894">8894</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9068">9068</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9137">9137</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9146">9146</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9171">9171</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9174">9174</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9179">9179</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9572">9572</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9575">9575</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9683">9683</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=9753">9753</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10137">10137</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10306">10306</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10323">10323</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10625">10625</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10715">10715</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10832">10832</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10837">10837</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10839">10839</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10914">10914</jump>, 
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10945">10945</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11123">11123</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11166">11166</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11221">11221</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11345">11345</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11704">11704</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11987">11987</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11828">11828</jump>,
-     <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12075">12075</jump></li>. 
+     <li>Fixes for the following bugzilla defects : 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=3238">3238</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=4603">4603</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5013">5013</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5016">5016</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=5941">5941</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6071">6071</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6268">6268</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6284">6284</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6356">6356</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6547">6547</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6798">6798</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6833">6833</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6925">6925</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=6972">6972</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7023">7023</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7118">7118</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7123">7123</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7157">7157</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7410">7410</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=7776">7776</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8324">8324</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8358">8358</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8551">8551</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8894">8894</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9068">9068</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9137">9137</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9146">9146</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9171">9171</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9174">9174</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9179">9179</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9572">9572</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9575">9575</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9683">9683</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=9753">9753</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10137">10137</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10306">10306</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10323">10323</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10625">10625</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10715">10715</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10832">10832</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10837">10837</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10839">10839</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10914">10914</jump>, 
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=10945">10945</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11123">11123</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11166">11166</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11221">11221</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11345">11345</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11704">11704</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11987">11987</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=11828">11828</jump>,
+     <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12075">12075</jump></li>. 
      <li>&xslt4j; now uses a list of supported encodings in a properties file 
      (org.apache.xml.serializer.Encodings.properties). Fixes Bugzilla 6356. Patch from Sergey Ushakov. </li>     
      <li>Support for the <jump href="http://www.exslt.org/">EXSLT</jump> function and result elements, and EXSLT 
@@ -597,7 +683,7 @@
      <li>Support for and bundling of xml-apis.jar from the RIVERCOURT1 branch of xml-commons.  This version of the Java
      APIs for XML Processing successfully passes the JAXP 1.1 and JAXP 1.2 TCKs.</li>
      <li>For a list of &xslt4j; commits, see xalan-cvs@xml.apache.org in the
-     <jump href="http://nagoya.apache.org/eyebrowse/index.html">Apache mailing list archive index</jump>.</li>
+     <resource-ref idref="apache-mail-archive" />.</li>
      </ul>
      </s3>
      <anchor name="other"/>
@@ -640,9 +726,9 @@
      <li>When you traverse the namespace axis for a collection of element nodes, &xslt4j; includes <em>one</em> namespace node for each namespace in scope 
      for one or more of the nodes in that collection. The XPath expression does not return additional (redundant) namespace nodes for each element
      for which the namespace nodes are in scope.<br/><br/></li>
-     <li>See <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2291">Bugzilla bug 2291</jump> for a discussion of issues surrounding
+     <li>See <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=2291">Bugzilla bug 2291</jump> for a discussion of issues surrounding
      use of the default character encoding to read META-INF/Services.<br/><br/></li>
-     <li>As <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1800">Bugzilla bug 1800</jump> reports, the Transformer does not get the 
+     <li>As <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=1800">Bugzilla bug 1800</jump> reports, the Transformer does not get the 
      setTransformState event until after the startDocument event. This could present a problem for tools developers, and we do intend to fix this 
      bug.</li> 
      </ul>
@@ -740,13 +826,8 @@
       <p>You can use Ant with the docs target to regenerate the User's Guide and with the javadocs target to regenerate the
       Javadoc API documentation. For more information, see <link anchor="ant">Using Ant</link>.</p>
    </s3>    
- </s2><anchor name="contact"/>
- <s2 title="Getting in Touch">
-  <p>Your feedback is more than welcome. Offers of help are even more so! Perhaps you would like to 
-  take on an active role in the ongoing development, testing, and documentation of &xslt4j;?</p> 
-<p>Please email your comments, questions, suggestions, and offers to join the Xalan team 
-to <human-resource-ref idref="xalandev"/>.</p>
  </s2>
+
 <!-- We need to overhaul this list if we still want to publish it.  
      It should probably be broken out into active & past contributors.
  <anchor name="developer-list"/>
diff --git a/xdocs/sources/xalan/resources.xml b/xdocs/sources/xalan/resources.xml
index 7f5f63e..97e4829 100644
--- a/xdocs/sources/xalan/resources.xml
+++ b/xdocs/sources/xalan/resources.xml
@@ -30,7 +30,7 @@
 
   <resource id="xml4j-used" 
             title="&xml4j-used;" 
-            location="http://xml.apache.org/xerces2-j/index.html"/>
+            location="http://xerces.apache.org/xerces2-j/index.html"/>
   <resource id="xml4j-distdir" 
             title="xerces-j distribution directory" 
             location="http://www.apache.org/dyn/closer.cgi/xml/xerces-j/"/>
@@ -41,7 +41,7 @@
             location="http://xml.apache.org/dist/LICENSE.txt"/>
   <resource id="jira"
             title="JIRA (the Apache issue tracker)"
-            location="http://issues.apache.org/jira/"/>
+            location="http://issues.apache.org/jira/browse/XALANJ"/>
   <resource id="buglist"
             title="XalanJ2 open bugs"         
             location="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;pid=10584&amp;resolutionIds=-1&amp;sorter/field=issuekey&amp;sorter/order=DESC"/>
@@ -59,7 +59,7 @@
 
   <resource id="dpawsonxslfaq" 
             title="XSL Frequently Asked Questions" 
-            location="http://www.dpawson.co.uk/xsl/xslfaq.html"/>
+            location="http://www.dpawson.co.uk/xsl/"/>
 
   <resource id="xsl" 
             title="Extensible Stylesheet Language (XSL) Version 1.0"
@@ -88,37 +88,45 @@
             location="http://www.megginson.com/SAX/sax.html"/>
   <resource id="sax2" 
             title="SAX 2" 
-            location="http://sax.sourceforge.net"/>
+            location="http://sax.sourceforge.net/"/>
   <resource id="jaxp" 
             title="Java API for XML Parsing 1.0" 
-            location="http://java.sun.com/xml/docs/api/index.html"/>
+            location="http://java.sun.com/webservices/jaxp/dist/1.1/docs/api/index.html"/>
   <resource id="jaxp11" 
             title="Java API for XML Processing 1.1" 
-            location="http://java.sun.com/xml/jaxp/dist/1.1/jaxp-1_1-spec.pdf"/>
+            location="http://java.sun.com/webservices/jaxp/dist/1.1/jaxp-1_1-spec.pdf"/>
   <resource id="jaxp12" 
             title="Java API for XML Processing 1.2" 
-            location="http://java.sun.com/xml/jaxp/index.html"/>            
+            location="http://java.sun.com/webservices/jaxp/index.jsp"/>            
   <resource id="jaxp13-longname-withacronym"
             title="&jaxp13-long;" 
-            location="http://java.sun.com/xml/jaxp/index.html"/>            
+            location="http://java.sun.com/webservices/jaxp/index.jsp"/>            
   <resource id="jaxp13"
             title="&jaxp13-short;"
-            location="http://java.sun.com/xml/jaxp/index.html"/>
+            location="http://java.sun.com/webservices/jaxp/index.jsp"/>
   <resource id="jsr063"
             title="Java Specification Request 63"
-            location="http://java.sun.com/aboutJava/communityprocess/review/jsr063"/>
+            location="http://jcp.org/aboutJava/communityprocess/review/jsr063/"/>
 
   <resource id="tomcat" 
             title="The Jakarta Site - Apache Tomcat"
-            location="http://jakarta.apache.org/tomcat/"/>
+            location="http://tomcat.apache.org/"/>
 
   <resource id="xmlapirepository"
             title="xml-commons/java/external/src"
-            location="http://cvs.apache.org/viewcvs.cgi/xml-commons/java/external/src/"/>
+            location="http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/"/>
 
   <resource id="endorsed"
             title="Endorsed Standards Override Mechanism"
-            location="http://java.sun.com/j2se/1.4/docs/guide/standards/"/>
+            location="http://java.sun.com/j2se/1.4.2/docs/guide/standards/"/>
+            
+  <resource id="apache-mail-archives"
+            title="Apache mail archives"
+            location="http://mail-archives.apache.org/mod_mbox/"/>
+            
+  <resource id="old-bugzilla"
+            title="Apache bugzilla"
+            location="http://issues.apache.org/bugzilla/"/>
 
   <human-resource id="xalandev" 
                   name="Xalan Development Mailing List" 
diff --git a/xdocs/sources/xalan/samples.xml b/xdocs/sources/xalan/samples.xml
index c1f96d1..d76acc8 100644
--- a/xdocs/sources/xalan/samples.xml
+++ b/xdocs/sources/xalan/samples.xml
@@ -186,9 +186,9 @@
     <p>For a general introduction, see <link idref="usagepatterns" anchor="servlet">Using &xslt4j; in a servlet</link>.</p>
     <p>The servlet subdirectory contains four sample servlets and one JSP that use &xslt4j; to perform transformations. The sample 
     code is compiled and packed in xalanservlet.war. To run these samples, you must place 
-    xalanservlet.war on a web server with a servlet engine. For example, using <jump href="http://jakarta.apache.org/tomcat/index.html">jakarta-tomcat 4.1.18</jump>. 
+    xalanservlet.war on a web server with a servlet engine. For example, using <jump href="http://tomcat.apache.org/index.html">jakarta-tomcat 4.1.*</jump>. 
     Copy the xalanservlet.war to %Tomcat_Home%/webapps. For more details about deploying
-    servlets on Tomcat, please refer to <jump href="http://jakarta.apache.org/tomcat/tomcat-4.1-doc/appdev/deployment.html">Deployment Organization</jump>.</p>
+    servlets on Tomcat, please refer to <jump href="http://tomcat.apache.org/tomcat-4.1-doc/appdev/deployment.html">Deployment Organization</jump>.</p>
     <note>Dependency on Tomcat version. If encountering "java.lang.VerifyError: Cannot inherit from final class" error, 
     replace xercesImpl.jar under %Tomcat_Home%/common/endorsed with the one included with &xslt4j; .</note>
     <p><link anchor="simplexsltservlet">servlet.SimpleXSLTServlet</link> applies a particular stylesheet to a particular 
@@ -379,8 +379,8 @@
     <s3 title="Setting up the SQL extension samples">   
     <p>To run the SQL library extension samples, do the following:</p>
     <p>The SQL Extension examples require the Apache Derby jars.
-     The Derby jars are available from <jump href="http://incubator.apache.org/derby/">
-     http://incubator.apache.org/derby/</jump>.</p>
+     The Derby jars are available from <jump href="http://db.apache.org/derby/">
+     http://db.apache.org/derby/</jump>.</p>
     <p>The sample batch/script files are configured to look for the 
      derby jars in the xml-xalan/java/samples/extensions/sql directory by default.</p>
     <p>If you already have derby installed and want to use that implementation.
diff --git a/xdocs/sources/xalan/usagepatterns.xml b/xdocs/sources/xalan/usagepatterns.xml
index 4b331c9..729b535 100644
--- a/xdocs/sources/xalan/usagepatterns.xml
+++ b/xdocs/sources/xalan/usagepatterns.xml
@@ -442,7 +442,7 @@
     provided that you avoid calls to the AppletContext showStatus() method. In other words, you can remove the showStatus() calls
     from org.apache.xalan.client.XSLTProcessorApplet, and run &xslt4j; applets from Netscape Communicator 6. This appears to be a
     Netscape bug, which hopefully will be fixed soon. For more information, see 
-    <jump href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3231">Bugzilla bug 3231</jump>.</p>
+    <jump href="http://issues.apache.org/bugzilla/show_bug.cgi?id=3231">Bugzilla bug 3231</jump>.</p>
 </s3>    
 </s2><anchor name="servlet"/>
 <s2 title="Using &xslt4j; in a servlet">
diff --git a/xdocs/sources/xsltc.xml b/xdocs/sources/xsltc.xml
index c9e0201..ec1c1f8 100644
--- a/xdocs/sources/xsltc.xml
+++ b/xdocs/sources/xsltc.xml
@@ -104,9 +104,6 @@
              source="xsltc/xsltc_trax_api.xml"/>
    <document id="xsltc_performance"
              label="Performance Hints" 
-             source="xsltc/xsltc_performance.xml"/>
- <separator/>
- <external href="todo.html" label="Credits"/>
-            
+             source="xsltc/xsltc_performance.xml"/>            
 </book>
   
diff --git a/xdocs/sources/xsltc/index.xml b/xdocs/sources/xsltc/index.xml
index 7698800..5dd6baa 100644
--- a/xdocs/sources/xsltc/index.xml
+++ b/xdocs/sources/xsltc/index.xml
@@ -89,7 +89,6 @@
         <li><link idref="xsl_variable_design">&lt;xsl:param&gt;</link></li>
         <li><link idref="xsl_include_design">&lt;xsl:include&gt;</link></li>
         <li><link idref="xsl_include_design">&lt;xsl:import&gt;</link></li>
-        <li><link idref="xsl_imports_design">&lt;xsl:apply-imports&gt;</link></li>
       </ul>
     </s4>
     <s4 title="XPath functions">
diff --git a/xdocs/style/stylesheets/done.xsl b/xdocs/style/stylesheets/done.xsl
index b32524e..a7e4753 100644
--- a/xdocs/style/stylesheets/done.xsl
+++ b/xdocs/style/stylesheets/done.xsl
@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-  <!--
-   * Licensed to the Apache Software Foundation (ASF) under one
-   * or more contributor license agreements. See the NOTICE file
-   * distributed with this work for additional information
-   * regarding copyright ownership. The ASF licenses this file
-   * to you under the Apache License, Version 2.0 (the  "License");
-   * you may not use this file except in compliance with the License.
-   * You may obtain a copy of the License at
-   *
-   *     http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
-  -->
-
 <!-- DOCTYPE xsl:stylesheet -->
 
 <!-- XSL Style sheet, DTD omitted -->