Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / bugs / login_page_non-obvious_with_openid.mdwn

diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn
index 3978bc526829a91557a7a70b8e569703b94293d4..1d087985a241d6603a0fae88377953a624a11291 100644 (file)
--- a/doc/bugs/login_page_non-obvious_with_openid.mdwn
+++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn
@@ -44,5 +44,4 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > I've improved the form, I think it's more obvious now that the openid
 > stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]]
 
-> I put the [[passwordauth]] fields in a fieldset as well, which should help
-> for login forms with both OpenID and passwordauth enabled. --[[JoshTriplett]]
+>> Looks good, thanks!  :-) -- [[AdamShand]]
\ No newline at end of file