aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-29 22:54:14 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-29 22:54:14 +0000
commit1e62e4f87fdf1441afab47a60aaf60b9246a5876 (patch)
treea4a6ef93bf7f0d215d3320d90317f13b9bb2514a /doc
parent67631c51ab971aa272b9b1230d2fe469d77091ee (diff)
downloadikiwiki-1e62e4f87fdf1441afab47a60aaf60b9246a5876.tar
ikiwiki-1e62e4f87fdf1441afab47a60aaf60b9246a5876.tar.gz
* Enable openid logins by default.
* Enable usedirs by default.
Diffstat (limited to 'doc')
-rw-r--r--doc/ikiwiki.setup8
-rw-r--r--doc/plugins.mdwn2
-rw-r--r--doc/plugins/openid.mdwn5
3 files changed, 8 insertions, 7 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index d54527eca..d498e8dfa 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -97,14 +97,14 @@ use IkiWiki::Setup::Standard {
syslog => 0,
# To link to user pages in a subdirectory of the wiki.
#userdir => "users",
- # To create output files named page/index.html rather than page.html.
- #usedirs => 1,
+ # To create output files named page.html rather than page/index.html.
+ #usedirs => 0,
# To add plugins, list them here.
- #add_plugins => [qw{goodstuff openid search wikitext camelcase
+ #add_plugins => [qw{goodstuff search wikitext camelcase
# htmltidy fortune sidebar map rst anonok}],
# If you want to disable any of the default plugins, list them here.
- #disable_plugins => [qw{inline htmlscrubber passwordauth}],
+ #disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
# For use with the tag plugin, make all tags be located under a
# base page.
diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 39f0d0209..6ee2f3a69 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -7,7 +7,7 @@ wiki, or just have [[type/fun]].
There's documentation if you want to [[write]] your own plugins, or you can
install and use plugins [[contributed|contrib]] by others.
-The [[mdwn]], [[inline]], [[htmlscrubber]], [[passwordauth]],
+The [[mdwn]], [[inline]], [[htmlscrubber]], [[passwordauth]], [[openid]],
[[signinedit]], [[lockedit]], and [[conditional]] plugins are enabled
by default. To enable other plugins, use the `--plugin` switch described in
[[usage]], or the equivalent `add_plugins` line in [[ikiwiki.setup]].
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 94929e7ab..a85727eca 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -1,4 +1,4 @@
-[[template id=plugin name=openid author="[[Joey]]"]]
+[[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
@@ -21,4 +21,5 @@ 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.
-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]].