Merge commit 'upstream/master' into prv/po

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

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 45ee46b960f0282196abb4ed1bc95e090b30ad01..45414142cefb9fd50f596a565e49a096c0a1871b 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" 14 "Accept only password logins" 18 "Accept both"]]
+[[!poll 60 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]