You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2012/08/22 13:31:15 UTC
svn commit: r1376000 - in /db/derby/docs/branches/10.8: ./
lib/dita2htmlImpl.xsl lib/map2htmtoc.xsl
Author: kahatlen
Date: Wed Aug 22 11:31:15 2012
New Revision: 1376000
URL: http://svn.apache.org/viewvc?rev=1376000&view=rev
Log:
DERBY-5905: Derby html documentation doesn't render properly and prints garbage on Internet Explorer
Merged revision 1375956 from trunk.
Modified:
db/derby/docs/branches/10.8/ (props changed)
db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl
db/derby/docs/branches/10.8/lib/map2htmtoc.xsl
Propchange: db/derby/docs/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/docs/trunk:r1375956
Modified: db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl?rev=1376000&r1=1375999&r2=1376000&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl (original)
+++ db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl Wed Aug 22 11:31:15 2012
@@ -3707,6 +3707,7 @@
<xsl:template name="chapter-setup">
<xsl:value-of select="$newline"/>
<html>
+ <xsl:call-template name="setTopicLanguage"/>
<xsl:value-of select="$newline"/>
<xsl:comment>
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -3724,7 +3725,6 @@
See the License for the specific language governing permissions and
limitations under the License.
</xsl:comment>
- <xsl:call-template name="setTopicLanguage"/>
<xsl:value-of select="$newline"/>
<xsl:call-template name="chapterHead"/>
<xsl:call-template name="chapterBody"/>
Modified: db/derby/docs/branches/10.8/lib/map2htmtoc.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/map2htmtoc.xsl?rev=1376000&r1=1375999&r2=1376000&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/map2htmtoc.xsl (original)
+++ db/derby/docs/branches/10.8/lib/map2htmtoc.xsl Wed Aug 22 11:31:15 2012
@@ -53,6 +53,7 @@
<xsl:template match="/">
<xsl:value-of select="$newline"/>
<html>
+ <xsl:call-template name="setTocLanguage"/>
<xsl:value-of select="$newline"/>
<xsl:comment>
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,7 +71,6 @@
See the License for the specific language governing permissions and
limitations under the License.
</xsl:comment>
- <xsl:call-template name="setTocLanguage"/>
<xsl:value-of select="$newline"/>
<head><xsl:value-of select="$newline"/>
<xsl:call-template name="generateCharset"/> <!-- Set the character set to UTF-8 -->