Merge branch 'master' into tova

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 198455f37b438abe00ef9ee5b2b3715cf69711b8..1320e4f413855402c17f8b421401e1d4d2c9716b 100644 (file)
--- 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 <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400
 

diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index fbf36629124b5be6ea39d4dba3a401c1b9c43afa..11ed223e7f7f083c537042fbbc1fe4ebaeb4ce67 100644 (file)
--- 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.