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

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 890bba4d94d698337e3456f62a5a8599933936c9..e0b24eab94b4d456b90a50ec3965a9191c86dc54 100644 (file)
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -8,3 +8,7 @@ Any idea how to fix this??
 > and it's not clear to me that they intend regular openid to work at all.
 > What is your google openid URL so I can take a look at the data they are
 > providing? --[[Joey]] 
+
+
+http://openid-provider.appspot.com/larrylud
+

diff --git a/doc/ikiwiki/markdown/discussion.mdwn b/doc/ikiwiki/markdown/discussion.mdwn
deleted file mode 100644 (file)
index d3affec..0000000
--- a/doc/ikiwiki/markdown/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Is anyone else having trouble using the definition list feature of multimarkdown?  If not, then I could use some help figuring out why it's not working on my text site.  Version is 3.141~bpo50+1 (debian backports), multimarkdown and mdwn support enabled in preferences.  Any pointers to the obvious thing I'm missing would be appreciated. - dave

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 7a6f84518289b1f270f22008dfdc49c166a1e4ad..79eeaec01ff7f8fb87154cec1088a81a2e6382f0 100644 (file)
--- 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 63 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]]
+[[!poll 63 "Accept only OpenID for logins" 20 "Accept only password logins" 36 "Accept both"]]