* Group passwordauth fields with a fieldset as well. Add a new

[ikiwiki.git] / doc / openid.mdwn

diff --git a/doc/openid.mdwn b/doc/openid.mdwn
index 7c6d2bda7dab2909d0a52dfaef729eadd4f813e3..7e46bdf6423ed69e16abb847aca884884404c2fe 100644 (file)
--- a/doc/openid.mdwn
+++ b/doc/openid.mdwn
@@ -1,9 +1,11 @@
 [[meta title="OpenID"]]
 
 [[meta title="OpenID"]]
 

-[[template id=note text="""

 [[if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."
 [[if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."

-     else="This wiki has OpenID **disabled**."]]
+     else="""
+This wiki has OpenID **disabled**.
+[[if test="enabled(passwordauth) and passwordauth"
+     then="You can sign into this wiki using [[passwordauth]]."]]

 """]]
 
 [OpenID](http://openid.net) is a decentralized authentication mechanism
 """]]
 
 [OpenID](http://openid.net) is a decentralized authentication mechanism


@@ -16,7 +18,7 @@ To sign up for an OpenID, visit one of the following identity providers:
 * [GetOpenID](https://getopenid.com/)
 * [Videntity](http://videntity.org/)
 * [LiveJournal](http://www.livejournal.com/openid/)
 * [GetOpenID](https://getopenid.com/)
 * [Videntity](http://videntity.org/)
 * [LiveJournal](http://www.livejournal.com/openid/)

-* or any of the many others out there..
+* or any of the [many others out there](http://openiddirectory.com/index.php?dir=1)..

 
 Your OpenID is the URL that you are given when you sign up.
 [[if test="enabled(openid)" then="""
 
 Your OpenID is the URL that you are given when you sign up.
 [[if test="enabled(openid)" then="""


@@ -25,10 +27,13 @@ signin form. You do not need to give this wiki a password or go through any
 registration process when using OpenID.
 """]]
 
 registration process when using OpenID.
 """]]
 

+[[if test="enabled(openid) and enabled(passwordauth) and passwordauth"
+     then="You can also sign into this wiki using [[passwordauth]]."]]
+

 ---
 
 It's also possible to make a page in the wiki usable as an OpenID url,
 by delegating it to an openid server. Here's an example of how to do that:
 
 ---
 
 It's also possible to make a page in the wiki usable as an OpenID url,
 by delegating it to an openid server. Here's an example of how to do that:
 

-       \[[meta link="http://www.myopenid.com/server" rel="openid.server"]]
-       \[[meta link="http://yourid.myopenid.com/" rel="openid.delegate"]]
+       \\[[meta openid="http://yourid.myopenid.com/"
+       server="http://www.myopenid.com/server"]]