Merge branch 'master' into tova

Conflicts:

	debian/changelog
master
Joey Hess 2008-09-30 21:04:22 -04:00
commit 85ec27ab58
2 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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 <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400

View File

@ -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.