Merge commit 'a547d2685866898665fad221939b0b820a42a088' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:22:04 +0000 (00:22 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:22:04 +0000 (00:22 -0500)
Conflicts:
templates/page.tmpl

1  2 
IkiWiki/Plugin/git.pm
templates/page.tmpl

Simple merge
index 0597b04f72b074830c2936a68379047c456bc8e0,661d4a51501d6ba7706312a5af1dea477860322f..6feab6cd8f48403f6e0d430f387617b86aa19768
@@@ -1,6 -1,9 +1,9 @@@
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ <TMPL_IF HTML5><!DOCTYPE html>
 -<html>
++<html lang="en">
+ <TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 -<html xmlns="http://www.w3.org/1999/xhtml">
 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ </TMPL_IF>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <meta http-equiv="Cache-Control" content="must-revalidate" />