Merge branch 'master' into po

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

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index f02a0a62ccbceb1909cbd5c8179d82daa9448b29..dd851e5492353a3adc0b04de76d40880bd94edb5 100644 (file)
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -1,6 +1,7 @@
-[[meta title="OpenID"]]
+[[!meta title="OpenID"]]
+[[!meta robots="noindex, follow"]]
 
-[[if test="enabled(openid)"
+[[!if test="enabled(openid)"
      then="This wiki has OpenID **enabled**."
      else="This wiki has OpenID **disabled**."]]
 
@@ -14,10 +15,11 @@ 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/)
-* or any of the [many others out there](http://openiddirectory.com/index.php?dir=1)..
+* [TrustBearer](https://openid.trustbearer.com/)
+* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html).
 
 Your OpenID is the URL that you are given when you sign up.
-[[if test="enabled(openid)" then="""
+[[!if test="enabled(openid)" then="""
 To sign in to this wiki using OpenID, just enter it in the OpenID field in the
 signin form. You do not need to give this wiki a password or go through any
 registration process when using OpenID.
@@ -28,5 +30,5 @@ registration process when using OpenID.
 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 openid="http://yourid.myopenid.com/"
+       \[[!meta openid="http://yourid.myopenid.com/"
               server="http://www.myopenid.com/server"]]