db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1375447 - in /db/derby/docs/branches/10.9: ./ lib/dita2htmlImpl.xsl lib/index.html lib/map2htmtoc.xsl
Date Tue, 21 Aug 2012 09:37:07 GMT
Author: kahatlen
Date: Tue Aug 21 09:37:06 2012
New Revision: 1375447

URL: http://svn.apache.org/viewvc?rev=1375447&view=rev
Log:
DERBY-5905: Derby html documentation doesn't render properly and prints garbage on Internet
Explorer

Merged revision 1374347 from trunk.

Modified:
    db/derby/docs/branches/10.9/   (props changed)
    db/derby/docs/branches/10.9/lib/dita2htmlImpl.xsl
    db/derby/docs/branches/10.9/lib/index.html
    db/derby/docs/branches/10.9/lib/map2htmtoc.xsl

Propchange: db/derby/docs/branches/10.9/
------------------------------------------------------------------------------
    svn:mergeinfo = /db/derby/docs/trunk:1374347

Modified: db/derby/docs/branches/10.9/lib/dita2htmlImpl.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/lib/dita2htmlImpl.xsl?rev=1375447&r1=1375446&r2=1375447&view=diff
==============================================================================
--- db/derby/docs/branches/10.9/lib/dita2htmlImpl.xsl (original)
+++ db/derby/docs/branches/10.9/lib/dita2htmlImpl.xsl Tue Aug 21 09:37:06 2012
@@ -3717,6 +3717,8 @@
 
 <xsl:template name="chapter-setup">
 <xsl:value-of select="$newline"/>
+<html>
+  <xsl:value-of select="$newline"/>
 <xsl:comment>
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -3733,8 +3735,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 </xsl:comment>
-<xsl:value-of select="$newline"/>
-<html>
   <xsl:call-template name="setTopicLanguage"/>
   <xsl:value-of select="$newline"/>
   <xsl:call-template name="chapterHead"/>

Modified: db/derby/docs/branches/10.9/lib/index.html
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/lib/index.html?rev=1375447&r1=1375446&r2=1375447&view=diff
==============================================================================
--- db/derby/docs/branches/10.9/lib/index.html (original)
+++ db/derby/docs/branches/10.9/lib/index.html Tue Aug 21 09:37:06 2012
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en-us">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +18,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en-us">
   <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
     <title>Web Sample</title>

Modified: db/derby/docs/branches/10.9/lib/map2htmtoc.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/lib/map2htmtoc.xsl?rev=1375447&r1=1375446&r2=1375447&view=diff
==============================================================================
--- db/derby/docs/branches/10.9/lib/map2htmtoc.xsl (original)
+++ db/derby/docs/branches/10.9/lib/map2htmtoc.xsl Tue Aug 21 09:37:06 2012
@@ -52,6 +52,8 @@
      ********************************************************************************* -->
 <xsl:template match="/">
 <xsl:value-of select="$newline"/>
+  <html>
+    <xsl:value-of select="$newline"/>
 <xsl:comment>
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -68,8 +70,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 </xsl:comment>
-<xsl:value-of select="$newline"/>
-  <html>
     <xsl:call-template name="setTocLanguage"/>
     <xsl:value-of select="$newline"/>
   <head><xsl:value-of select="$newline"/>



Mime
View raw message