Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / news / openid.mdwn

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 5b2b0785f25df3b0437d9f9c1bc2d04caab38ec4..ad76606aab0e89c12ce73b6b15acca084b3159c8 100644 (file)
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -3,11 +3,11 @@ decentralized authentication mechanism that allows you to have one login
 that you can use on a growing number of websites.
 
 Traditional password-based logins are still supported, but I'm considering
 that you can use on a growing number of websites.
 
 Traditional password-based logins are still supported, but I'm considering

-switching at least ikiwiki.kitenet.net over to using only OpenID logins. 
+switching at least ikiwiki.info over to using only OpenID logins. 

 That would mean blowing away all the currently registered users and
 their preferences. If you're active on this wiki, I suggest you log out and
 log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
 That would mean blowing away all the currently registered users and
 their preferences. If you're active on this wiki, I suggest you log out and
 log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 

-[[poll 21 "Accept only OpenID for logins" 13 "Accept only password logins" 17 "Accept both"]]
+[[!poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]