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

diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm
index 8f2aa73d6f60eeca3aece6954a146219ebc63feb..652e6df0a67ca75aba0e2eec9bdbbc3bb6c04e45 100644 (file)
--- a/IkiWiki/Plugin/date.pm
+++ b/IkiWiki/Plugin/date.pm
@@ -6,8 +6,8 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
-       hook(type => "getsetup", id => "meta", call => \&getsetup);
-       hook(type => "preprocess", id => "meta", call => \&preprocess);
+       hook(type => "getsetup", id => "date", call => \&getsetup);
+       hook(type => "preprocess", id => "date", call => \&preprocess);
 }
 
 sub getsetup () {

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index cd71abf64250b47a5614e0a4bd95f97325890d40..53713ce1084dd52a5aeabef67b7c389161ffccde 100644 (file)
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -1,3 +1,9 @@
+Now that google supports using thier profiles as OpenIDs, that can be used
+directly to sign into ikiwiki. Just use, for example, 
+<http://www.google.com/profiles/joeyhess> . Tested and it works. --[[Joey]] 
+
+## historical discussion
+
 when I login via to this wiki (or ours) via Google's OpenID, I get this error:
 
 Error: OpenID failure: no_identity_server: The provided URL doesn't declare its OpenID identity server.