Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index 6ab7b1d704a9825b9a54d493169238a275c7a43e..c63bbcc39cefc0374eff67b4f94195bf2dcb9088 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low
     inside tagbase, when it's set.
   * htmlscrubber: Add a config setting that can be used to disable the
     scrubber acting on a set of pages.
+  * Epand usage message and add --help. Closes: #500344
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400
 

diff --git a/ikiwiki.in b/ikiwiki.in
index cb9e3c347814db4bdc859abbb719330745c61075..f96daab0bb9c55233c2a5a1e0f38a0596d3a1e0f 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,8 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
-       die gettext("usage: ikiwiki [options] source dest"), "\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n",
+           gettext("       ikiwiki --setup configfile"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -94,6 +95,7 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {