From d579c1ac1f0b3144921d342e659aff7008aaea05 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 22 Jan 2015 16:25:56 +0100
Subject: Merge (manually) branches 'bars', 'h1title-da', '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 561bf5c..e6827c4 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 e0fdc09..8336bf1 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

'/notmuch/commit/?h=master'>root</a>/<a href='/notmuch/commit/tags?h=master'>tags</a>/<a href='/notmuch/commit/tags/7b?h=master'>7b</a>/<a href='/notmuch/commit/tags/7b/58?h=master'>58</a>/<a href='/notmuch/commit/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk?h=master'>mailman.0.1591336804.13319.mailman@lists.homebase.dk</a>/<a href='/notmuch/commit/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master'>inbox</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>committer</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master&amp;id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>fd54908da2b05c526dd3bee9b6dcd093214a220d</a> (<a href='/notmuch/patch/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/notmuch/tree/?h=master'>c69c845069c99d1d01044f6fafda7c08433329c6</a> /<a href='/notmuch/tree/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master'>tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master&amp;id=ba46132213560cf3335d53560d519c0ec0190da2'>ba46132213560cf3335d53560d519c0ec0190da2</a> (<a href='/notmuch/diff/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master&amp;id2=ba46132213560cf3335d53560d519c0ec0190da2'>diff</a>)</td></tr></table>
<div class='commit-subject'><span class='decoration'><a class='branch-deco' href='/notmuch/log/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master'>master</a></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/notmuch/diff/tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox?h=master'>tags/7b/58/mailman.0.1591336804.13319.mailman@lists.homebase.dk/inbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='0%'><tr><td class='add' style='width: -nan%;'/><td class='rem' style='width: -nan%;'/><td class='none' style='width: -nan%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td>