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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 047ab8212f16591bdcf3daf03d36c7436f4cb819..4fefadf09d5994c982735da22f6da194a563be50 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -55,8 +55,8 @@ sub parentlinks ($) { #{{{
        my $path="";
        my $title=$config{wikiname};
        
-       return if $page eq 'index'; # toplevel
        foreach my $dir (split("/", $page)) {
+               next if $dir eq 'index';
                push @ret, { url => urlto($path, $page), page => $title };
                $path.="/".$dir;
                $title=pagetitle($dir);

diff --git a/Makefile.PL b/Makefile.PL
index 0315b6d49bfe9bfff2a8c76eff7112601bd0a196..272d0504b152010071bd93298bd84bb596b568bd 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,12 +31,7 @@ ikiwiki.out: ikiwiki.in
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
-       LANG= perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
-               --underlaydir=underlays/basewiki --nousedirs\
-               --wikiname="ikiwiki" --verbose \
-               --exclude=/discussion --no-discussion --userdir=users \
-               --plugin=goodstuff --plugin=version \
-               --plugin=haiku --plugin=polygen --plugin=fortune
+       perl -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man

diff --git a/debian/changelog b/debian/changelog
index 65f5838acd3c5a7d31f7d6502199017b7ba5ba2e..75462b6f96429211fcfd01970ae60b8c23e849f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.17) UNRELEASED; urgency=low
+
+  * Improved parentlinks special case for index pages.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 19 Dec 2007 16:39:07 -0500
+
 ikiwiki (2.16) unstable; urgency=low
 
   * Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory

diff --git a/doc/todo/toplevel_index.mdwn b/doc/todo/toplevel_index.mdwn
index 5adbaa7ebe4c5a79ec36ec5e38b024c3b8cf486a..77e31581114a8a90c4e7ccecaaca1ed20f36acb5 100644 (file)
--- a/doc/todo/toplevel_index.mdwn
+++ b/doc/todo/toplevel_index.mdwn
@@ -2,6 +2,11 @@ Some inconsistences around the toplevel [[index]] page:
 
 * [[ikiwiki]] is a separate page; links to [[ikiwiki]] should better go to
   the [[index]] though.
+
+  > At least for this wiki, I turned out to have a use for [[ikiwiki]]
+  > pointing to a different page, though the general point might still
+  > stand.
+
 * The toplevel [[ikiwiki/Discussion]] page has some weird parentlinks
   behavior. This could be special cased around with the following patch.
   However, I'm unsure if I like the idea of more special cases around this.
@@ -21,10 +26,12 @@ Here is a patch:
                        if (! $skip) {
                                $path.="../";
 
+   > Came up with a better patch for this, [[done]] --[[Joey]]
+
 ---
 
 > I would like to suggest another tack, namely a bigger, better special case. 
 > The basic idea is that all indices of the form foo/bar/index get the wiki path foo/bar.
 > You could do this today using [[todo/index.html_allowed]], except that the toplevel 
 > page "index" becomes "", which causes all sorts of chaos. The discussion page would 
-> become /discussion, and the weird parentlinks behavior would go away. --Ethan
\ No newline at end of file
+> become /discussion, and the weird parentlinks behavior would go away. --Ethan

diff --git a/docwiki.setup b/docwiki.setup
new file mode 100644 (file)
index 0000000..0a6a866
--- /dev/null
+++ b/docwiki.setup
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+# Configuration file for ikiwiki to build its documentation wiki.
+
+use IkiWiki::Setup::Standard {
+       wikiname => "ikiwiki",
+       srcdir => "doc",
+       destdir => "html",
+       templatedir => "templates",
+       underlaydir => "underlays/basewiki",
+       wrappers => [],
+       discussion => 0,
+       exclude => qr/\/discussion/,
+       locale => '',
+       verbose => 1,
+       syslog => 0,
+       userdir => "users",
+       usedirs => 0,
+       add_plugins => [qw{goodstuff version haiku polygen fortune}],
+}