doc updates for goto branch merge

diff --git a/debian/changelog b/debian/changelog
index 82a23212b994b07b0dd741b4b6531d97bbc24366..f3927f1211a6b704b074827c9d0162408ddf9598 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ikiwiki (3.04) UNRELEASED; urgency=low
+
+  * apache404: New plugin which lets you use the IkiWiki CGI script as
+    an Apache 404 handler, to give the behaviour of various other wiki
+    engines where visiting a nonexistent page provides you with a link
+    to create it. (smcv)
+  * Factor out redundant code into goto plugin. (smcv)
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 31 Jan 2009 19:04:45 -0500
+
 ikiwiki (3.03) unstable; urgency=low
 
   * Avoid feeding decoded unicode to Term::ReadLine. Closes: 512169

diff --git a/debian/copyright b/debian/copyright
index 71fb470135d63cbd0e4940d2e0b70e1d79bb0a38..bdfbaa5737dd9e7c6725fa4f7833ea5d427c387e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,6 +118,10 @@ Copyright:
  © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
+Files: apache404.pm
+Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+

diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index fbc3d8bbc6784946fa9b638d9bc04dbc87e66c80..ffcbf95d42533e7a593c4c0848535a474c491dd9 100644 (file)
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -26,6 +26,14 @@ configuration changes should work anywhere.
   Or, if you've put it in a `~/public_html`, edit
   `/etc/apache2/mods-available/userdir.conf`.
 
+You may also want to enable the [[plugins/apache404]]
+plugin. To make apache use it, the apache config file
+will need a further modification to make it use ikiwiki's CGI
+as the apache 404 handler. Something like this, with
+the path adjusted to where you've put the CGI:
+
+       ErrorDocument 404 /cgi-bin/ikiwiki.cgi
+
 ## lighttpd
 
 Here is how to enable cgi on [lighttpd](http://www.lighttpd.net/) and

diff --git a/doc/todo/apache_404_ErrorDocument_handler.mdwn b/doc/todo/apache_404_ErrorDocument_handler.mdwn
index b580294ca6189e3973a670afa42e7c5e9ac1b043..4ae1d1a792f0754f4946baffa648937dfa1273be 100644 (file)
--- a/doc/todo/apache_404_ErrorDocument_handler.mdwn
+++ b/doc/todo/apache_404_ErrorDocument_handler.mdwn
@@ -21,3 +21,5 @@ error output needs to be at least 512 bytes long, so some padding might also be
 Implemented in the 'goto' branch in my git repository. You can see this
 feature in action [on my blog](http://smcv.pseudorandom.co.uk/no/such/page/).
 --[[smcv]]
+
+[[done]]

diff --git a/doc/todo/generic___39__do__61__goto__39___for_CGI.mdwn b/doc/todo/generic___39__do__61__goto__39___for_CGI.mdwn
index 4bf3fb449f0769750dec1fd0ddb68a2321800ec2..26c5202d01b7a84554f620214039b25f2a48cb30 100644 (file)
--- a/doc/todo/generic___39__do__61__goto__39___for_CGI.mdwn
+++ b/doc/todo/generic___39__do__61__goto__39___for_CGI.mdwn
@@ -31,3 +31,5 @@ something, and moved to `IkiWiki/CGI.pm`?
 
 >>> No, good point - the `REDIRECT_STATUS` check is sufficiently unambiguous
 >>> already. Fixed. --[[smcv]]
+
+[[done]]