diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-30 21:04:22 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-30 21:04:22 -0400 |
commit | 85ec27ab5822d67788a6d13255d4929a789c4435 (patch) | |
tree | faeaea185eee3756198ed6f00dc5cb54500b5ee8 /doc | |
parent | 2bfbad7af4e3e09287b4c06c958d0929c0c7bc63 (diff) | |
parent | 0651e86a4c3e6f038b1362e33ea08235f046c102 (diff) |
Merge branch 'master' into tova
Conflicts:
debian/changelog
Diffstat (limited to 'doc')
-rw-r--r-- | doc/plugins/httpauth.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index fbf366291..11ed223e7 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -3,7 +3,7 @@ This plugin allows HTTP basic authentication to be used to log into the wiki. To use the plugin, your web server should be set up to perform HTTP -basic authentiation. The authenticated user will be automatically signed -into the wiki. +basic authentiation for at least the directory containing `ikiwiki.cgi`. +The authenticated user will be automatically signed into the wiki. This plugin is included in ikiwiki, but is not enabled by default. |