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

1  2 
IkiWiki/Wrapper.pm
templates/page.tmpl

Simple merge
index d4d681084f54a0a566467d86d9e2a235b31d3f32,7e850a56bacd93549d07f4920e4bc35b9507f414..0597b04f72b074830c2936a68379047c456bc8e0
@@@ -1,15 -1,19 +1,16 @@@
  <!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">
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Cache-Control" content="must-revalidate" />
  <title><TMPL_VAR TITLE></title>
 -<TMPL_IF NAME="FAVICON">
 -<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 -</TMPL_IF>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 -<TMPL_IF NAME="LOCAL_CSS">
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 -<TMPL_ELSE>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 -</TMPL_IF>
 +<meta http-equiv="Content-Style-Type" content="text/css" />
 +<meta name="robots" content="all" />
 +<meta name="author" content="SIPB" />
 +<meta name="description" content="MIT Student Information Processing Board" />        
 +<meta name="keywords" content="SIPB, MIT, hackers" />
 +<link rel="stylesheet" type="text/css" href="<TMPL_VAR BASEURL>style.css" />
  <TMPL_IF NAME="EDITURL">
  <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
  </TMPL_IF>