prototyping improvements

diff --git a/README b/README
index e9ee15dfe91c1e91e4d0a171678911d04f563cce..454aa843b03ec02fc072d5caec719aa0040b54e8 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Use ./Makefile.PL to generate a Makefile, "make" will generate docs and a
-man page, and "make install" will install ikiwiki.
+Use ./Makefile.PL to generate a Makefile, "make" will build the
+documentation wiki and a man page, and "make install" will install ikiwiki.
 
 All other documentation is in the ikiwiki documentation wiki. 

diff --git a/ikiwiki b/ikiwiki
index a9a0c8ff46fe3585443994895fe9aa64526f6dfc..dd5758b3a752a1aa01e345a75b890caf03bd2459 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -81,7 +81,7 @@ sub getconfig () { #{{{
        }
 } #}}}
 
-sub checkconfig { #{{{
+sub checkconfig () { #{{{
        if ($config{cgi} && ! length $config{url}) {
                error("Must specify url to wiki with --url when using --cgi");
        }
@@ -99,11 +99,7 @@ sub checkconfig { #{{{
        }
 } #}}}
 
-sub usage { #{{{
-       die "usage: ikiwiki [options] source dest\n";
-} #}}}
-
-sub error { #{{{
+sub error ($) { #{{{
        if ($config{cgi}) {
                print "Content-type: text/html\n\n";
                print misctemplate("Error", "<p>Error: @_</p>");
@@ -111,6 +107,16 @@ sub error { #{{{
        die @_;
 } #}}}
 
+sub usage () { #{{{
+       die "usage: ikiwiki [options] source dest\n";
+} #}}}
+
+sub possibly_foolish_untaint ($) { #{{{
+       my $tainted=shift;
+       my ($untainted)=$tainted=~/(.*)/;
+       return $untainted;
+} #}}}
+
 sub debug ($) { #{{{
        return unless $config{verbose};
        if (! $config{cgi}) {
@@ -121,12 +127,6 @@ sub debug ($) { #{{{
        }
 } #}}}
 
-sub possibly_foolish_untaint { #{{{
-       my $tainted=shift;
-       my ($untainted)=$tainted=~/(.*)/;
-       return $untainted;
-} #}}}
-
 sub basename ($) { #{{{
        my $file=shift;
 
@@ -236,7 +236,7 @@ sub isinlinableimage ($) { #{{{
        $file=~/\.(png|gif|jpg|jpeg)$/;
 } #}}}
 
-sub htmllink { #{{{
+sub htmllink ($$;$$) { #{{{
        my $page=shift;
        my $link=shift;
        my $noimageinline=shift; # don't turn links into inline html images