From fce78d71a0d4a6847cbb83da33fdb4522a002578 Mon Sep 17 00:00:00 2001
From: mburmester <mburmester@web>
Date: Thu, 1 Jan 2009 22:37:38 -0500
Subject: bug reopened

---
 ...__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
index 88a187dfc..1979e3fbd 100644
--- a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
+++ b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
@@ -24,4 +24,6 @@ Here is a patch against ikiwiki-1.51 for using find(1) and install(1) instead of
 
 >> No, apparently FreeBSD `install` does not support `-D`.  See [the FreeBSD install manpage](http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+6.2-RELEASE&format=html). --[[JoshTriplett]]
 
->> Patch applied; [[bugs/done]]. --[[JoshTriplett]]
+>> Patch applied. --[[JoshTriplett]]
+
+There are still/again "cp -a"s in the Makefile as of 3.00
-- 
cgit v1.2.3


From 0bf9ea723ad8969a422b4589ced8385ef6c0f170 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 2 Jan 2009 11:21:18 +0100
Subject: meta branch merge required

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 2 ++
 doc/plugins/contrib/po.mdwn                                   | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index 158656a13..cccd53d05 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -14,3 +14,5 @@ The `IkiWiki::pagetitle` function does not respect title changes via `meta.title
 >> It was actually more complicated than expected. A working prototype is
 >> now in my `meta` branch, see my userpage for the up-to-date url.
 >> Thus tagging [[patch]]. --[[intrigeri]]
+>>
+>>> Joey, please consider merging my `meta` branch. --[[intrigeri]]
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index f90ffeed2..9919ac595 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -139,6 +139,11 @@ Any thoughts on this?
 >>>>> to have the links text generation more customizable through
 >>>>> plugins, I could do both at the same time if we consider this
 >>>>> matter to be important enough. --[[intrigeri]]
+>>>>>
+>>>>>> The translation status in links is now implemented in my
+>>>>>> `po`branch. It requires my `meta` branch changes to
+>>>>>> work, though. I consider the latter to be mature enough to
+>>>>>> be merged. --[[intrigeri]]
 
 >> FWIW, I'm tracking your po branch in ikiwiki master git in the po
 >> branch. One thing I'd like to try in there is setting up a translated
-- 
cgit v1.2.3


From e411ee4ff7dcd8c60ccaf5c9932e64a8d42d9211 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Jan 2009 12:35:26 -0500
Subject: it falls back to using install

---
 ..._40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
index 1979e3fbd..12c0ad07f 100644
--- a/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
+++ b/doc/bugs/Use_install__40__1__41___instead_of_cp__40__1__41___for_installing_files.mdwn
@@ -24,6 +24,9 @@ Here is a patch against ikiwiki-1.51 for using find(1) and install(1) instead of
 
 >> No, apparently FreeBSD `install` does not support `-D`.  See [the FreeBSD install manpage](http://www.freebsd.org/cgi/man.cgi?query=install&apropos=0&sektion=0&manpath=FreeBSD+6.2-RELEASE&format=html). --[[JoshTriplett]]
 
->> Patch applied. --[[JoshTriplett]]
+>> Patch applied; [[done]]. --[[JoshTriplett]]
 
 There are still/again "cp -a"s in the Makefile as of 3.00
+
+> It's a cp -a || install. Is that causing you a problem somehow?
+> --[[Joey]] 
-- 
cgit v1.2.3


From 45fa889473ba34a13390549587730fec4142fc99 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Mon, 5 Jan 2009 03:39:46 -0500
Subject: openid bug?

---
 doc/bugs/Error:_Your_login_session_has_expired._.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/bugs/Error:_Your_login_session_has_expired._.mdwn

(limited to 'doc/bugs')

diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
new file mode 100644
index 000000000..1d200a410
--- /dev/null
+++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
@@ -0,0 +1,11 @@
+I keep getting:
+
+	Error: Your login session has expired.
+
+Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any ideas?
+
+
+	iki@hugh:~$ dpkg -l | grep openid
+	ii  libnet-openid-consumer-perl     0.14-4                library for consumers of OpenID iden
+	tities
+	iki@hugh:~$
-- 
cgit v1.2.3


From 22358e4b27a02e784cbf608c39bcd12781c8dca6 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <http://ptecza.myopenid.com/@web>
Date: Mon, 5 Jan 2009 11:20:35 -0500
Subject: * Problem with URLs with parentheses

---
 doc/bugs/URLs_with_parentheses_displayed_badly.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/bugs/URLs_with_parentheses_displayed_badly.mdwn

(limited to 'doc/bugs')

diff --git a/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
new file mode 100644
index 000000000..f52694e39
--- /dev/null
+++ b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
@@ -0,0 +1,10 @@
+I've noticed that Ikiwiki displays URLs with parentheses badly. The problem occurs
+in the latest version 3.00 and older versions. Please look at the link to following
+Polish entry about C programming language at Wikipedia (it seems that URLs with
+parentheses are popular there):
+
+[Język programowania C](http://pl.wikipedia.org/wiki/C_(j%C4%99zyk_programowania))
+
+I need to escape a closing parenthesis of the URL to fix the problem.
+
+[Język programowania C](http://pl.wikipedia.org/wiki/C_(j%C4%99zyk_programowania\))
-- 
cgit v1.2.3


From d4599f72502af1a8dbf94478038111d992929588 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 16:00:19 -0500
Subject: markdown bug

---
 doc/bugs/URLs_with_parentheses_displayed_badly.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
index f52694e39..a603925d0 100644
--- a/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
+++ b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
@@ -8,3 +8,6 @@ parentheses are popular there):
 I need to escape a closing parenthesis of the URL to fix the problem.
 
 [Język programowania C](http://pl.wikipedia.org/wiki/C_(j%C4%99zyk_programowania\))
+
+> This is a bug in markdown version 1. It is fixed in [[!cpan Text::Markdown]],
+> which ikiwiki will use if it's installed. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 09a76de33dbcd929eefe57d9e9a628b8a39a0404 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 16:15:46 -0500
Subject: analysis

---
 .../Error:_Your_login_session_has_expired._.mdwn   | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
index 1d200a410..6cfd2868c 100644
--- a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
+++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
@@ -9,3 +9,31 @@ Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any
 	ii  libnet-openid-consumer-perl     0.14-4                library for consumers of OpenID iden
 	tities
 	iki@hugh:~$
+
+> This error occurs if ikiwiki sees something that looks like a CSRF
+> attack. It checks for such an attack by embedding your session id on the
+> page edit form, and comparing that id with the session id used to post
+> the form.
+> 
+> So, somehow your session id has changed between opening the edit form and
+> posting it. A few ways this could happen:
+> 
+> * Genuine CSRF attack (unlikely)
+> * If you logged out and back in, in another tab, while the edit form was
+>   open.
+> * If `.ikiwiki/sessions.db` was deleted/corrupted while you were in the
+>   midst of the edit.
+> * If some bug in CGI::Session caused your session not to be saved to the
+>   database somehow.
+> * If your browser didn't preserve the session cookie across the edit
+>   process, for whatever local reason.
+> * If you were using a modified version of `editpage.tmpl`, and 
+>   it did not include `FIELD-SID`.
+> * If you upgraded from an old version of ikiwiki, before `FIELD-SID` was
+>   added (<= 2.41), and had an edit form open from that old version, and
+>   tried to save it using the new.
+>  
+> I don't see the problem editing the sandbox there myself, FWIW.
+> (BTW, shouldn't you enable the meta plugin so RecentChanges displays
+> better?)
+> --[[joey]]
-- 
cgit v1.2.3


From 48ca2c95cd9b5fc21f2d4077a22f66442126e34c Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <http://ptecza.myopenid.com/@web>
Date: Mon, 5 Jan 2009 16:21:35 -0500
Subject: * Switched to Text::Markdown. Thanks a lot!

---
 doc/bugs/URLs_with_parentheses_displayed_badly.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
index a603925d0..59b67d493 100644
--- a/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
+++ b/doc/bugs/URLs_with_parentheses_displayed_badly.mdwn
@@ -9,5 +9,11 @@ I need to escape a closing parenthesis of the URL to fix the problem.
 
 [Język programowania C](http://pl.wikipedia.org/wiki/C_(j%C4%99zyk_programowania\))
 
+--[[Paweł|users/ptecza]]
+
 > This is a bug in markdown version 1. It is fixed in [[!cpan Text::Markdown]],
 > which ikiwiki will use if it's installed. [[done]] --[[Joey]] 
+
+>> Thanks a lot for the hint, Joey! I've installed `libtext-markdown-perl` package
+>> (Aptitude has removed `markdown` package to satisfy dependencies) and now
+>> I don't need to escape Wikipedia URLs with parentheses :) --[[Paweł|users/ptecza]]
-- 
cgit v1.2.3


From 865cbaea51c5d64966bcb01c718c737b03cd64d5 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Mon, 5 Jan 2009 16:31:50 -0500
Subject:

---
 doc/bugs/Error:_Your_login_session_has_expired._.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
index 6cfd2868c..046d6e10d 100644
--- a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
+++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
@@ -37,3 +37,8 @@ Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any
 > (BTW, shouldn't you enable the meta plugin so RecentChanges displays
 > better?)
 > --[[joey]]
+
+
+Thanks for you excellent analysis. The bug was due to old pre-3.0 **templates** laying about. After deleting them, ikiwiki defaults to its own templates. Clever. :-)
+
+[[bugs/done]]
-- 
cgit v1.2.3


From 80f4ecdc5b329e12af088c6dde01ebafc27d8cbf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 21:26:47 -0500
Subject: new gitweb url form fixes some bugs too

---
 doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn        | 4 ++++
 doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'doc/bugs')

diff --git a/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn b/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn
index c465bdd4a..564982ff3 100644
--- a/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn
+++ b/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn
@@ -8,3 +8,7 @@ cases of the one which was installed directly before the current commit.
 > I don't see one, except for diffs that show all changes in the commit,
 > rather than only changes to a single file. This feels like a bug in
 > gitweb. --[[Joey]]
+
+This is fixed by using the new gitweb style urls. Which new gitweb
+requires, but is a manual change you have to make in your setup. So,
+[[done]] --[[Joey]] 
diff --git a/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn b/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn
index 255d9cee7..0b4d70596 100644
--- a/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn
+++ b/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn
@@ -8,3 +8,6 @@ Going from *RecentChanges*, when viewing the diffs of newly created pages
 > I don't see any way to make gitweb do that. You can click on the filename
 > after the "diff -cc" to see the whole file output, but gitweb won't show
 > a diff for a newly added file. --[[Joey]]
+
+>> happily this, too, is fixed by using the new style gitweb urls. [[done]]
+>> --[[Joey]] 
-- 
cgit v1.2.3


From 26d3ba61467cdd5d05722015a38dc0fbd5053926 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:02:05 -0500
Subject: analysis, found another bug

---
 doc/bugs/links_misparsed_in_CSV_files.mdwn | 10 ++++++++++
 doc/bugs/table_external_file_links.mdwn    |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 doc/bugs/table_external_file_links.mdwn

(limited to 'doc/bugs')

diff --git a/doc/bugs/links_misparsed_in_CSV_files.mdwn b/doc/bugs/links_misparsed_in_CSV_files.mdwn
index 169c070e7..4dae4aeab 100644
--- a/doc/bugs/links_misparsed_in_CSV_files.mdwn
+++ b/doc/bugs/links_misparsed_in_CSV_files.mdwn
@@ -12,6 +12,16 @@ Oh, wait, I see the problem. IkiWiki::linkify is only called if the external fil
 
 (this is inside /usr/share/perl5/IkiWiki/Plugin/table.pm).
 
+> To reproduce this bug, I had to install the old, broken markdown 1.0,
+> instead of the now-default Text::Markdown.
+> 
+> Why is linkify not called for external files? Well, I checked the
+> history, and it's probably best to say "for historical reasons that no
+> longer apply".
+
 I am rather confused what this check does, and the fact the comments are very different for CSV and DSV when the code is the same doesn't seem to help.
 
+> The code is not the same; two operations are run in different orders for
+> CSV and DSV, as the comments note. --[[Joey]] 
+
 -- Brian May
diff --git a/doc/bugs/table_external_file_links.mdwn b/doc/bugs/table_external_file_links.mdwn
new file mode 100644
index 000000000..f86808c77
--- /dev/null
+++ b/doc/bugs/table_external_file_links.mdwn
@@ -0,0 +1,7 @@
+If wikilinks are put in an external table file, those links are not seen at
+scan time, and so ikiwiki does not know to update the page containing the
+table when the pages the links point to change (are added, removed, etc).
+
+There seem only two solutions to that bug -- either really make wikilinks
+in an external table file not work (probably by escaping them), 
+or run the preprocess code also in scan (expensive!). --[[Joey]]
-- 
cgit v1.2.3


From da166e74227d084fd15878ce9a3099e07ebcc2c2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:05:09 -0500
Subject: table: Fix misparsed links in external files

linkify data from external files at the same time as data from an inlined
table would be linkified.
---
 IkiWiki/Plugin/table.pm                    | 20 ++++++++------------
 debian/changelog                           |  6 ++++++
 doc/bugs/links_misparsed_in_CSV_files.mdwn |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'doc/bugs')

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 479f3d745..dd124929d 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -50,22 +50,18 @@ sub preprocess (@) {
 			defined $params{delimiter} ? $params{delimiter} : ",",);
 		# linkify after parsing since html link quoting can
 		# confuse CSV parsing
-		if (! exists $params{file}) {
-			@data=map {
-				[ map {
-					IkiWiki::linkify($params{page},
-						$params{destpage}, $_);
-				} @$_ ]
-			} @data;
-		}
+		@data=map {
+			[ map {
+				IkiWiki::linkify($params{page},
+					$params{destpage}, $_);
+			} @$_ ]
+		} @data;
 	}
 	elsif (lc $params{format} eq 'dsv') {
 		# linkify before parsing since wikilinks can contain the
 		# delimiter
-		if (! exists $params{file}) {
-			$params{data} = IkiWiki::linkify($params{page},
-				$params{destpage}, $params{data});
-		}
+		$params{data} = IkiWiki::linkify($params{page},
+			$params{destpage}, $params{data});
 		@data=split_dsv($params{data},
 			defined $params{delimiter} ? $params{delimiter} : "|",);
 	}
diff --git a/debian/changelog b/debian/changelog
index f8eb49030..bf47fda04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.02) UNRELEASED; urgency=low
+
+  * table: Fix misparsed links in external files.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
+
 ikiwiki (3.01) unstable; urgency=low
 
   * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories.
diff --git a/doc/bugs/links_misparsed_in_CSV_files.mdwn b/doc/bugs/links_misparsed_in_CSV_files.mdwn
index 4dae4aeab..27d2b7b1e 100644
--- a/doc/bugs/links_misparsed_in_CSV_files.mdwn
+++ b/doc/bugs/links_misparsed_in_CSV_files.mdwn
@@ -17,7 +17,7 @@ Oh, wait, I see the problem. IkiWiki::linkify is only called if the external fil
 > 
 > Why is linkify not called for external files? Well, I checked the
 > history, and it's probably best to say "for historical reasons that no
-> longer apply".
+> longer apply". So, changed as you suggest. [[done]] --[[Joey]] 
 
 I am rather confused what this check does, and the fact the comments are very different for CSV and DSV when the code is the same doesn't seem to help.
 
-- 
cgit v1.2.3


From 4ce73f2d88e9a177ad84e19b48a17b2d604a808b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:35:53 -0500
Subject: table: Find links in external files in scan pass.

---
 IkiWiki/Plugin/table.pm                 | 22 ++++++++++++++++++++--
 debian/changelog                        |  1 +
 doc/bugs/table_external_file_links.mdwn |  2 ++
 docwiki.setup                           |  2 ++
 po/ikiwiki.pot                          |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'doc/bugs')

diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index dd124929d..96d63f455 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -8,7 +8,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "table", call => \&getsetup);
-	hook(type => "preprocess", id => "table", call => \&preprocess);
+	hook(type => "preprocess", id => "table", call => \&preprocess, scan => 1);
 }
 
 sub getsetup () {
@@ -27,13 +27,31 @@ sub preprocess (@) {
 	);
 
 	if (exists $params{file}) {
-		if (! $pagesources{$params{file}}) {
+		if (! exists $pagesources{$params{file}}) {
 			error gettext("cannot find file");
 		}
 		$params{data} = readfile(srcfile($params{file}));
 		add_depends($params{page}, $params{file});
 	}
 
+	if (! defined wantarray) {
+		# scan mode --	if the table uses an external file, need to
+		# scan that file too.
+		return unless exists $params{file};
+
+		IkiWiki::run_hooks(scan => sub {
+			shift->(
+				page => $params{page},
+				content => $params{data},
+			);
+		});
+
+		# Preprocess in scan-only mode.
+		IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1);
+
+		return;
+	}
+
 	if (lc $params{format} eq 'auto') {
 		# first try the more simple format
 		if (is_dsv_data($params{data})) {
diff --git a/debian/changelog b/debian/changelog
index bf47fda04..e79ad04cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ikiwiki (3.02) UNRELEASED; urgency=low
 
   * table: Fix misparsed links in external files.
+  * table: Find links in external files in scan pass.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/bugs/table_external_file_links.mdwn b/doc/bugs/table_external_file_links.mdwn
index f86808c77..7b35383c5 100644
--- a/doc/bugs/table_external_file_links.mdwn
+++ b/doc/bugs/table_external_file_links.mdwn
@@ -5,3 +5,5 @@ table when the pages the links point to change (are added, removed, etc).
 There seem only two solutions to that bug -- either really make wikilinks
 in an external table file not work (probably by escaping them), 
 or run the preprocess code also in scan (expensive!). --[[Joey]]
+
+[[done]]
diff --git a/docwiki.setup b/docwiki.setup
index 6d732fd6b..ffb4a7c16 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -15,5 +15,7 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
+	cgiurl => "http://me",
+	url => "http://me",
 	add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 560a5b2a1..957c9eea3 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 18:53-0500\n"
+"POT-Creation-Date: 2009-01-06 14:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3


From fe1671fd57f9d5fc44ffced43187e62d2ac5f732 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 15:40:50 -0500
Subject: formatting

---
 doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/bugs')

diff --git a/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn b/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn
index 012fcec2c..02ce4e221 100644
--- a/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn
+++ b/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn
@@ -3,8 +3,8 @@ matches all other pages, including all internal pages. This can lead to
 unexpected results, since it will match a bunch of recentchanges pages,
 etc.
 
-Recall that internal-use pages are not matched by a glob. So "*" doesn't
-match them. So if the pagespec is "* and !foo and !bar", it won't match
+Recall that internal-use pages are not matched by a glob. So "\*" doesn't
+match them. So if the pagespec is "\* and !foo and !bar", it won't match
 them. This is the much more common style.
 
 There's an odd inconsistency with entirely negated pagespecs. If "!foo"
-- 
cgit v1.2.3


From 72ca231fd0d7f98e85848855be852d1ae6eaa8cf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 17:29:12 -0500
Subject: rename: Show full names of affected pages.

---
 IkiWiki/Plugin/rename.pm                                                | 1 +
 debian/changelog                                                        | 1 +
 ...f_successful_rename_should_list_the_full_path_to_affected_pages.mdwn | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'doc/bugs')

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index fa0358843..41af3ca4d 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -417,6 +417,7 @@ sub linklist {
 		{
 			page => htmllink($dest, $dest, $_,
 					noimageinline => 1,
+					linktext => pagetitle($_),
 				)
 		}
 	} @{$list}]
diff --git a/debian/changelog b/debian/changelog
index e79ad04cc..55eb4be0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
 
   * table: Fix misparsed links in external files.
   * table: Find links in external files in scan pass.
+  * rename: Show full names of affected pages.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
index 2d9677e7f..132d23463 100644
--- a/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
+++ b/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn
@@ -10,3 +10,5 @@ The following pages have been automatically modified to update their links to us
 <li><a href="./../../tips/convert_mediawiki_to_ikiwiki/discussion/">discussion</a></li><li><a href="./../../tips/untrusted_git_push/discussion/">discussion</a></li></ul>...
 
 In this situation I think the link to pages should be expanded to show the entire path, since there is quite likely to be a lot of things like "discussion". -- [[users/Jon]]
+
+[[done]]
-- 
cgit v1.2.3