Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index a6e01ccc5bde91e9bcc1d1c4935f48d92d3c69c9..d4aa18c7d289e95a5a3974611748956a5f449250 100644 (file)
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -1,12 +1,12 @@
-[[template id=plugin name=openid included=1 author="[[Joey]]"]]
-[[tag type/auth]]
+[[!template id=plugin name=openid core=1 author="[[Joey]]"]]
+[[!tag type/auth]]

 
 This plugin allows users to use their [OpenID](http://openid.net/) to log
 into the wiki.
 
 
 This plugin allows users to use their [OpenID](http://openid.net/) to log
 into the wiki.
 

-The plugin needs the [[cpan Net::OpenID::Consumer]] perl module. The
-[[cpan LWPx::ParanoidAgent]] perl module is used if available, for added
-security. Finally, the [[cpan Crypt::SSLeay]] perl module is needed to support
+The plugin needs the [[!cpan Net::OpenID::Consumer]] perl module. The
+[[!cpan LWPx::ParanoidAgent]] perl module is used if available, for added
+security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed to support

 users entering "https" OpenID urls.
 
 This plugin has a configuration option. You can set `--openidsignup`
 users entering "https" OpenID urls.
 
 This plugin has a configuration option. You can set `--openidsignup`


@@ -17,8 +17,9 @@ This plugin supports the
 [myopenid.com affiliate program](http://myopenid.com/affiliate_welcome),
 which can be used to help users sign up for an OpenID and log into your
 site in a single, unified process. When you create the affiliate, specify a
 [myopenid.com affiliate program](http://myopenid.com/affiliate_welcome),
 which can be used to help users sign up for an OpenID and log into your
 site in a single, unified process. When you create the affiliate, specify a

-login url like `http://example.com/ikiwiki.cgi?do=postsignin`. Once the
+login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the

 affiliate is created, set `openidsignup` to point to the affiliate's signup
 url.
 
 affiliate is created, set `openidsignup` to point to the affiliate's signup
 url.
 

-This plugin is included in ikiwiki, but is not enabled by default.
+This plugin is enabled by default, but can be turned off if you want to
+only use some other form of authentication, such as [[passwordauth]].