rename apache404 -> 404

This may already work with other web servers that have copied apache's
interface, and it should be easy to add support to it for web servers that
use some other interface. So, make the name more general.

diff --git a/IkiWiki/Plugin/apache404.pm b/IkiWiki/Plugin/404.pm
similarity index 94%
rename from IkiWiki/Plugin/apache404.pm
rename to IkiWiki/Plugin/404.pm
index e7ce70435490063b2d429f21692cac3dd5e40780..5550ea7d19dda10131344385358b65e6ed3bb81e 100644 (file)
--- a/IkiWiki/Plugin/apache404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -2,14 +2,14 @@
 # Copyright © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 # Licensed under the GNU GPL, version 2, or any later version published by the
 # Free Software Foundation
-package IkiWiki::Plugin::apache404;
+package IkiWiki::Plugin::404;
 
 use warnings;
 use strict;
 use IkiWiki 3.00;
 
 sub import {
-       hook(type => "cgi", id => 'apache404',  call => \&cgi);
+       hook(type => "cgi", id => '404',  call => \&cgi);
        IkiWiki::loadplugin("goto");
 }
 

diff --git a/debian/changelog b/debian/changelog
index f3927f1211a6b704b074827c9d0162408ddf9598..be32d3abf57256e7ce29c0c4fe4fde909fb62e1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (3.04) UNRELEASED; urgency=low
 
-  * apache404: New plugin which lets you use the IkiWiki CGI script as
+  * 404: 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)

diff --git a/debian/copyright b/debian/copyright
index bdfbaa5737dd9e7c6725fa4f7833ea5d427c387e..f589b4a8f5e68eed1265a20a7c0ad61be862808f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,7 +118,7 @@ Copyright:
  © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 
-Files: apache404.pm
+Files: 404.pm
 Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
 License: GPL-2+
 

diff --git a/doc/plugins/apache404.mdwn b/doc/plugins/404.mdwn
similarity index 82%
rename from doc/plugins/apache404.mdwn
rename to doc/plugins/404.mdwn
index bab8fb59dfbce462b989bb06140de19c609d5e09..8d36279c884f2c73cd0c0103f79323fbbe16c08c 100644 (file)
--- a/doc/plugins/apache404.mdwn
+++ b/doc/plugins/404.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=apache404 author="[[Simon_McVittie|smcv]]"]]
+[[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]]
 [[!tag type/useful]]
 
 This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,

diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn
index 21dda16b2bd7fe53c5ebcf11413d69614afe6572..9c401c5d2b8fe864726e4bee7cfa33bb365f74be 100644 (file)
--- a/doc/plugins/goto.mdwn
+++ b/doc/plugins/goto.mdwn
@@ -2,7 +2,7 @@
 [[!tag type/useful]]
 
 This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly
-for internal use by the [[apache404]], [[comments]] and [[recentchanges]]
+for internal use by the [[404]], [[comments]] and [[recentchanges]]
 plugins, which enable it automatically.
 
 With this plugin enabled you can link to `ikiwiki.cgi?do=goto&page=some/where`

diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index ffcbf95d42533e7a593c4c0848535a474c491dd9..04d7a972191f7293c38597424ebe3cc2f9cbc5f4 100644 (file)
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -26,11 +26,10 @@ 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:
+* You may also want to enable the [[plugins/404]] 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
 

diff --git a/t/apache404.t b/t/404.t
similarity index 89%
rename from t/apache404.t
rename to t/404.t
index 00fc3525004fd1e2fc063b26bc4f5c4146fa6271..0bb3c60637e3935c9a743029b5346ab800b7b4eb 100755 (executable)
--- a/t/apache404.t
+++ b/t/404.t
@@ -3,11 +3,10 @@ use warnings;
 use strict;
 use Test::More tests => 17;
 
-BEGIN { use_ok("IkiWiki::Plugin::apache404"); }
+BEGIN { use_ok("IkiWiki::Plugin::404"); }
 
 sub cgi_page_from_404 {
-       return IkiWiki::Plugin::apache404::cgi_page_from_404(shift, shift,
-                                                            shift);
+       return IkiWiki::Plugin::404::cgi_page_from_404(shift, shift, shift);
 }
 
 $IkiWiki::config{htmlext} = 'html';