From: Joey Hess Date: Wed, 1 Oct 2008 01:04:22 +0000 (-0400) Subject: Merge branch 'master' into tova X-Git-Tag: 2.66~34^2~3 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/85ec27ab5822d67788a6d13255d4929a789c4435?hp=2bfbad7af4e3e09287b4c06c958d0929c0c7bc63 Merge branch 'master' into tova Conflicts: debian/changelog --- diff --git a/debian/changelog b/debian/changelog index 198455f37..1320e4f41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low creating a new page will save it to foo/index.mdwn by default. Closes: #474611 (Sponsored by The TOVA Company.) + * httpauth: Document that ikiwiki.cgi has to be in a directory subject to + authentication. Closes: #500524 -- Joey Hess Thu, 25 Sep 2008 13:45:55 -0400 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.