From: Joey Hess <joey@kitenet.net>
Date: Tue, 31 May 2011 20:24:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110431~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a24c0c543d4e4111dc206813889558bd5376fc8e?hp=dac4f405b2f2e0e499131dba3dfa7308729ab980

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/doc/bugs/Can__39__t_connect_to_ikiwiki_git_repo_through_http.mdwn b/doc/bugs/Can__39__t_connect_to_ikiwiki_git_repo_through_http.mdwn
index 409eb39d5..decfd7269 100644
--- a/doc/bugs/Can__39__t_connect_to_ikiwiki_git_repo_through_http.mdwn
+++ b/doc/bugs/Can__39__t_connect_to_ikiwiki_git_repo_through_http.mdwn
@@ -14,3 +14,5 @@ Also, clicking on the "gitweb" link gets me to the front page of ikiwiki.info, n
 > needs to be fixed there before git http can be used. In the meantime, 
 > the github mirror does provide it: <http://github.com/joeyh/ikiwiki.git>
 > --[[Joey]] [[!tag done]]
+
+>> Thanks. -- [[KathrynAndersen]]
diff --git a/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn b/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
index 92e759ca9..8cfc65591 100644
--- a/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
+++ b/doc/bugs/Error:_OpenID_failure:_time_bad_sig:.mdwn
@@ -44,3 +44,9 @@ betacantrips}, and I think re-logging in always works. --Ethan
 
 > Does seem easier to repro than I thought.
 > Ok, fixed it.. [[bugs/done]] --[[Joey]]
+
+Hmmmmm, looks like it is not entirely fixed.  I am getting it on my own
+[blog](http://blog.tobez.org/).  Just upgraded to 3.20110430, same same.
+I am using custom openid with redirection to myopenid.com.
+Please tell me if you need more info.  The same openid worked fine to login to *this* site to post this.
+-- Anton
diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index cb71c0887..084787207 100644
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -1,6 +1,6 @@
 First, if you just want to embed videos using the html5 `<video>` tag,
 you can do that without switching anything else to html5.
-However, if you want to fully enter the brave new world of html5, read on..
+However, if you want to fully enter the brave new world of html5, read on.
 
 Currently, ikiwiki does not use html5 by default. There is a `html5`
 setting that can be turned on, in your setup file. Rebuild with it set, and