You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by de...@apache.org on 2009/01/26 01:28:52 UTC
svn commit: r737617 - in
/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./
doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Author: dennisl
Date: Mon Jan 26 00:28:52 2009
New Revision: 737617
URL: http://svn.apache.org/viewvc?rev=737617&view=rev
Log:
[DOXIASITETOOLS-8] Move charset encoding info to top of <head>.
o Merge r732684 from trunk.
Modified:
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed)
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 00:28:52 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,733390,736602-736603,736628-736630,736929
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,732684,733390,736602-736603,736628-736630,736929
Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=737617&r1=737616&r2=737617&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm (original)
+++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm Mon Jan 26 00:28:52 2009
@@ -289,6 +289,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
<title>$title</title>
<style type="text/css" media="all">
@import url("$relativePath/css/maven-base.css");
@@ -299,7 +300,6 @@
#foreach( $author in $authors )
<meta name="author" content="$author" />
#end
- <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
#if ( $decoration.body.head )
#foreach( $item in $decoration.body.head.getChildren() )
## Workaround for DOXIA-150 due to a non-desired behaviour in p-u