diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-14 18:45:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-14 18:45:31 -0400 |
| commit | 44d4f086efcd5e777e100eeca078fc6eafaf9476 (patch) | |
| tree | 018ecb3bf8bbe1f9ab9532e656bbcf786d1bd3eb /doc/news | |
| parent | 16299dbae894b916e776da3bb6aea2a44c15501a (diff) | |
| parent | 3d40fd88a54890d280aec6744d88f9f9ecfe12be (diff) | |
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
Diffstat (limited to 'doc/news')
| -rw-r--r-- | doc/news/openid.mdwn | 2 | ||||
| -rw-r--r-- | doc/news/openid/discussion.mdwn | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c576d8c97..fbec04c18 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ 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 46 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]] +[[poll 51 "Accept only OpenID for logins" 17 "Accept only password logins" 34 "Accept both"]] diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 1c5929274..47897b9cd 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -35,3 +35,11 @@ only Apache/iptables rules for this? Maybe it's related to >> Qatar Wikipedia pages and the admins of Wikipedia had to ban all >> IP addresses of that country (fortunately Qatar has only one ISP). >> --[[Paweł|ptecza]] + +---- + +## Error voting + +> Error: /srv/web/ikiwiki.info/todo/Configurable_minimum_length_of_log_message_for_web_edits/index.html independently created, not overwriting with version from todo/Configurable_minimum_length_of_log_message_for_web_edits + +[[jondowland]] |