From 80c09a21c7e5ff2def45a3a3d76b81dc4c017d31 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 22 Jan 2015 16:23:44 +0100
Subject: Merge (manually) branches 'bars', 'h1title', 'h5bp-da' and
 'langsbottom' into plaintitle-da

---
 aggregatepost.tmpl | 2 +-
 googleform.tmpl    | 2 +-
 page.tmpl          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl
index a89ccfc..5a0f6e7 100644
--- a/aggregatepost.tmpl
+++ b/aggregatepost.tmpl
@@ -12,7 +12,7 @@
 [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
 <TMPL_IF AUTHOR>
-[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR AUTHOR ESCAPE=HTML> (<TMPL_VAR NAME ESCAPE=HTML>)"]]
 <TMPL_ELSE>
 [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
 </TMPL_IF>
diff --git a/googleform.tmpl b/googleform.tmpl
index 9468e06..b1c3078 100644
--- a/googleform.tmpl
+++ b/googleform.tmpl
@@ -1,5 +1,5 @@
 
-<form method="get" action="http://www.google.com/search" id="searchform">
+<form method="get" action="https://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
   <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text"
diff --git a/page.tmpl b/page.tmpl
index bd341dc..7438923 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -129,7 +129,7 @@
 
 <div id="pagebody">
 
-<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
+<TMPL_IF HTML5><section id="content" role="main"><TMPL_ELSE><div id="content"></TMPL_IF>
 <h1><TMPL_VAR TITLE></h1>
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -142,7 +142,7 @@
 
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
-<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
+<TMPL_IF HTML5><section id="comments" role="complementary"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -171,7 +171,7 @@
 </TMPL_IF>
 </TMPL_UNLESS>
 
-<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_IF HTML5><footer id="footer" class="pagefooter" role="contentinfo"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-- 
cgit v1.2.3