Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / httpauth.mdwn

diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 26f258bd38a832e2595f1c876b646e44b2096009..11ed223e7f7f083c537042fbbc1fe4ebaeb4ce67 100644 (file)
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -1,9 +1,9 @@
-[[template id=plugin name=httpauth author="Alec Berryman"]]
-[[tag type/auth]]
+[[!template id=plugin name=httpauth author="Alec Berryman"]]
+[[!tag type/auth]]

 
 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
 
 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.
 
 This plugin is included in ikiwiki, but is not enabled by default.