Merging webhelp branch (r8692:8881) into trunk

diff --cc releasetools/xslns.mk
index 6a1b181cbf6b6a197c059475a4e7cf79347d6649,f48ac21393f0c7d7460ef7f29b6e8ca23b729961..7aadd035ca2d07ed59545e1eba16b9325a6c8ced
--- 1/releasetools/xslns.mk
--- 2/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@@ -26,6 -26,15 +26,15 @@@ zip-ns: zi
          docbook-$(DISTRO)-$(ZIPVER) \
          docbook-$(DISTRO)-ns-$(ZIPVER)); 
  
 -      sed -i "s/validate=true/validate=false/" \
+ # Run xslt on xsl/webhelp/docsrc/readme.xml
+       $(XSLT) \
+       $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/webhelp/docsrc/readme.xml \
+       $(DOCBOOK_SVN)/docbook/relaxng/tools/db4-upgrade.xsl \
+       $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/docsrc/readme.xml 
+ # Turn off validation in webhelp:
++      sed -i "s/validate-against-dtd=true/validate-against-dtd=false/" \
+         $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/webhelp/build.properties
+ 
  # change branch info
        sed -i "s/^\(.*\)<fm:Branch>XSL Stylesheets<\/fm:Branch>$$/\1<fm:Branch>XSL-NS Stylesheets<\/fm:Branch>/" \
          $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/VERSION