From 38d58467f491ac7e154d83b7fa0a90d1ebb79efc Mon Sep 17 00:00:00 2001
From: "http://www.cse.unsw.edu.au/~willu/"
 <http://www.cse.unsw.edu.au/~willu/@web>
Date: Thu, 1 Jan 2009 07:33:36 -0500
Subject: link to related bug

---
 doc/todo/modify_page_filename_in_plugin.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/modify_page_filename_in_plugin.mdwn b/doc/todo/modify_page_filename_in_plugin.mdwn
index 4099487a1..a13c8b62f 100644
--- a/doc/todo/modify_page_filename_in_plugin.mdwn
+++ b/doc/todo/modify_page_filename_in_plugin.mdwn
@@ -6,6 +6,8 @@ The problem is that I occasionally have xxx.c and xxx.h in the same directory an
 
 My solution is to allow plugins to provide a hook that sets the pagename. --[[/users/bstpierre]]
 
+> You might also find the solution to [[bugs/multiple_pages_with_same_name]] helps you.  That patch is already applied. -- [[Will]]
+
     --- /usr/share/perl5/IkiWiki.pm.ORIG    2008-10-03 14:12:50.000000000 -0400
     +++ /usr/share/perl5/IkiWiki.pm 2008-10-07 11:57:26.000000000 -0400
     @@ -196,11 +196,32 @@
-- 
cgit v1.2.3


From be67d10a813ae37512daacbbab9815eecd5e94ef Mon Sep 17 00:00:00 2001
From: "http://openid.alexandrefranke.com/"
 <http://openid.alexandrefranke.com/@web>
Date: Thu, 1 Jan 2009 18:17:17 -0500
Subject: Add actual result for the example

---
 doc/ikiwiki/directive/progress.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/progress.mdwn b/doc/ikiwiki/directive/progress.mdwn
index 529f1c3c1..c619ef3fc 100644
--- a/doc/ikiwiki/directive/progress.mdwn
+++ b/doc/ikiwiki/directive/progress.mdwn
@@ -15,4 +15,8 @@ discussion pages:
 
 	\[[!progress totalpages="* and !*/Discussion" donepages="*/Discussion"]]
 
+Which would result in the following:
+
+[[!progress totalpages="* and !*/Discussion" donepages="*/Discussion"]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


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')

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')

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 ba47fe42465b1e1bc5bef7f82ceeac8f3feee696 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 2 Jan 2009 12:54:58 +0100
Subject: po: added note about now implemented feature

Signed-off-by: intrigeri <intrigeri@boum.org>
---
 doc/plugins/contrib/po.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 9919ac595..edd665185 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -86,6 +86,9 @@ Any thoughts on this?
 >>> to avoid breaking existing functionality, it implies to hack a bit
 >>> [[plugins/edittemplate]] so that multiple templates can be
 >>> inserted at page creation time. [[--intrigeri]]
+>>>
+>>>> I implemented such a warning using the formbuilder_setup hook.
+>>>> --[[intrigeri]]
 >>
 >> And also, is there any way to start a translation of a page into a new
 >> lanauge using the web interface?
-- 
cgit v1.2.3


From 499c4ed0754bd8396e6bccaa886996cef4724fd0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Jan 2009 14:11:41 -0500
Subject: update

---
 doc/ikiwiki-makerepo.mdwn | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index dcebbb96a..9c532f201 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -6,19 +6,20 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
 
 ikiwiki-makerepo svn|git|monotone srcdir repository
 
-ikiwiki-makerepo mercurial srcdir
+ikiwiki-makerepo bzr|mercurial srcdir
 
 # DESCRIPTION
 
 `ikiwiki-makerepo` injects a `srcdir` directory, containing an ikiwiki wiki,
-into a `repository` that it creates. The repository can be a svn, git, or
-mercurial repository.
+into a `repository` that it creates. The repository can be created using
+any of a variety of revision control systems.
 
-Note that for mercurial, the srcdir is converted into a mercurial
-repository. There is no need to have a separate repository with mercurial.
+Note that for mercurial and bzr, the srcdir is converted into a
+repository. There is no need to have a separate repository with mercurial
+or bzr.
 
-Note that for monotone, you are assumed to already have run "mtn genkey" to generate
-key.
+Note that for monotone, you are assumed to already have run "mtn genkey"
+to generate a key.
 
 # AUTHOR
 
-- 
cgit v1.2.3


From 235136f55c92646069de67fb0743ef2f7d26cd49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Jan 2009 12:31:48 -0500
Subject: Revert "Add actual result for the example"

This reverts commit be67d10a813ae37512daacbbab9815eecd5e94ef.

We don't demo directives on directive doc pages, to avoid doing unnecessary
work at build time (not a big deal here) and to avoid broken directives if
the plugin is not enabled.

This fact could probably be documented better, but I don't want to mention
it on every page..
---
 doc/ikiwiki/directive/progress.mdwn | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/progress.mdwn b/doc/ikiwiki/directive/progress.mdwn
index c619ef3fc..529f1c3c1 100644
--- a/doc/ikiwiki/directive/progress.mdwn
+++ b/doc/ikiwiki/directive/progress.mdwn
@@ -15,8 +15,4 @@ discussion pages:
 
 	\[[!progress totalpages="* and !*/Discussion" donepages="*/Discussion"]]
 
-Which would result in the following:
-
-[[!progress totalpages="* and !*/Discussion" donepages="*/Discussion"]]
-
 [[!meta robots="noindex, follow"]]
-- 
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')

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 66ff63c296b5be28a95b32d849926714470049af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Jan 2009 12:40:22 -0500
Subject: Fix documentation about git hook to use right name. Closes: #510393

---
 debian/changelog |  1 +
 doc/rcs/git.mdwn | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 26e22aa94..0f2c75787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.01) UNRELEASED; urgency=low
 
   * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories.
     Closes: #510518
+  * Fix documentation about git hook to use right name. Closes: #510393
 
  -- Joey Hess <joeyh@debian.org>  Fri, 02 Jan 2009 14:12:16 -0500
 
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index deddfbd6d..000eb0b3c 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -20,9 +20,9 @@ working clones (with working directories) as leaf nodes.  The root
 working clones.
 
 One of the leaf node clone repositories is special; it has working
-directory which is used to compile the wiki from, and is also used by the
+directory which is used to compile the wiki, and is also used by the
 [[cgi]] to commit changes made via the web interface. It is special
-since the `post-commit` hook for the bare root repository is used to
+since the `post-update` hook for the bare root repository is used to
 trigger an update of this repository, and then an ikiwiki refresh
 updates the published  wiki itself.
 
@@ -43,9 +43,9 @@ repositories:
   repositories will push to/pull from.  It is a bare repository, since
   there are problems pushing to a repository that has a working
   directory. This is called _repository_ in [[ikiwiki-makerepo]]'s
-  manual page. Nominally, this bare repository has a `post-commit` hook
+  manual page. Nominally, this bare repository has a `post-update` hook
   that either is or calls ikiwiki's git wrapper, which changes to the
-  working directory for ikiwiki, does a _git pull_, and refreshes ikiwiki
+  working directory for ikiwiki, does a `git pull`, and refreshes ikiwiki
   to regenerate the wiki with any new content. The [[setup]] page describes
   how to do this.
 
@@ -64,7 +64,7 @@ repositories:
   hack on your wiki. you can commit local changes to the version on
   the laptop, perhaps while offline. Any new content should be pushed to the
   bare master repository when you are ready to publish it, and then
-  the post-commit hook of the bare repository will ensure that the
+  the post-update hook of the bare repository will ensure that the
   ikiwiki's source directory is updated, and the ikiwiki refreshed
   with the new content.
 
@@ -79,7 +79,7 @@ It is **paramount** that you **never** push to the non-bare repository
 Instead, clone the bare repository as mentioned above, and push
 **only** to the bare repository.
 
-The ikiwiki `post-commit` hook should be put in the bare repository.
+The ikiwiki `post-update` hook should be put in the bare repository.
 
 ## git repository with multiple committers
 
@@ -147,7 +147,7 @@ is the normal behaviour of ikiwiki, set the configuration of the local wiki:
 
       gitorigin_branch => "",
       ## git post-commit wrapper
-      wrapper => "/working/dir/.git/hooks/post-commit",
+      git_wrapper => "/working/dir/.git/hooks/post-commit",
 
 Then just committing should refresh the private ikiwiki on the local
 host.  Now just run `ikiwiki -setup localwiki.setup -getctime` and
-- 
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')

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')

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')

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')

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')

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')

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 02a4fbac31aa5f6d1f32341d2250426ea2876730 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 19:05:43 -0500
Subject: add news item for ikiwiki 3.01

---
 doc/news/version_3.01.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/news/version_3.01.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.01.mdwn b/doc/news/version_3.01.mdwn
new file mode 100644
index 000000000..c92b6173f
--- /dev/null
+++ b/doc/news/version_3.01.mdwn
@@ -0,0 +1,19 @@
+News for ikiwiki 3.01:
+
+   If your wiki uses git, and you have a `diffurl` configured in
+   its setup file, you should be aware that gitweb has stopped
+   supporting the url form commonly used for the `diffurl`.
+   You can change your setup to use the newer gitweb url form:
+     http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1\_to]];hp=[[sha1\_from]];hb=[[sha1\_commit]];hpb=[[sha1\_parent]]
+   The changes from the old form are the addition of the `hpb` parameter,
+   and the change to the value used for the `hb` parameter.
+
+ikiwiki 3.01 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories.
+     Closes: #[510518](http://bugs.debian.org/510518)
+   * Fix documentation about git hook to use right name. Closes: #[510393](http://bugs.debian.org/510393)
+   * yesno: Always accept English even when localised.
+   * yesno: Also accept 1 and 0 as input.
+   * A recent change to gitweb removed support for the form of diffurl
+     that many ikiwiki setups use. Document how to use the new url form."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 88eb525df82b164f15117219310dddae95ee2757 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 19:07:40 -0500
Subject: formatting

---
 doc/news/version_3.01.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/news/version_3.01.mdwn b/doc/news/version_3.01.mdwn
index c92b6173f..e03b3706e 100644
--- a/doc/news/version_3.01.mdwn
+++ b/doc/news/version_3.01.mdwn
@@ -4,7 +4,9 @@ News for ikiwiki 3.01:
    its setup file, you should be aware that gitweb has stopped
    supporting the url form commonly used for the `diffurl`.
    You can change your setup to use the newer gitweb url form:
-     http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=[[file]];h=[[sha1\_to]];hp=[[sha1\_from]];hb=[[sha1\_commit]];hpb=[[sha1\_parent]]
+
+ 	http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=\[[file]];h=\[[sha1\_to]];hp=\[[sha1\_from]];hb=\[[sha1\_commit]];hpb=\[[sha1\_parent]]
+
    The changes from the old form are the addition of the `hpb` parameter,
    and the change to the value used for the `hb` parameter.
 
@@ -16,4 +18,4 @@ ikiwiki 3.01 released with [[!toggle text="these changes"]]
    * yesno: Always accept English even when localised.
    * yesno: Also accept 1 and 0 as input.
    * A recent change to gitweb removed support for the form of diffurl
-     that many ikiwiki setups use. Document how to use the new url form."""]]
\ No newline at end of file
+     that many ikiwiki setups use. Document how to use the new url form."""]]
-- 
cgit v1.2.3


From 80b074192de81a7f9092eee834518261bada4a7e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Jan 2009 19:09:43 -0500
Subject: formatting

---
 doc/news/version_3.01.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/news/version_3.01.mdwn b/doc/news/version_3.01.mdwn
index e03b3706e..3f2c8f2d0 100644
--- a/doc/news/version_3.01.mdwn
+++ b/doc/news/version_3.01.mdwn
@@ -5,7 +5,7 @@ News for ikiwiki 3.01:
    supporting the url form commonly used for the `diffurl`.
    You can change your setup to use the newer gitweb url form:
 
- 	http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=\[[file]];h=\[[sha1\_to]];hp=\[[sha1\_from]];hb=\[[sha1\_commit]];hpb=\[[sha1\_parent]]
+ 	http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=\[[file]];h=\[[sha1_to]];hp=\[[sha1_from]];hb=\[[sha1_commit]];hpb=\[[sha1_parent]]
 
    The changes from the old form are the addition of the `hpb` parameter,
    and the change to the value used for the `hb` parameter.
-- 
cgit v1.2.3


From e65bdf090634f8d5ec531b2259f1bfd8fb4bc18a Mon Sep 17 00:00:00 2001
From: "http://puck42.myopenid.com/" <http://puck42.myopenid.com/@web>
Date: Mon, 5 Jan 2009 21:02:43 -0500
Subject:

---
 doc/todo/allow_disabling_backlinks.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 doc/todo/allow_disabling_backlinks.mdwn

(limited to 'doc')

diff --git a/doc/todo/allow_disabling_backlinks.mdwn b/doc/todo/allow_disabling_backlinks.mdwn
new file mode 100644
index 000000000..8f2792082
--- /dev/null
+++ b/doc/todo/allow_disabling_backlinks.mdwn
@@ -0,0 +1,18 @@
+This patch allows disabling the backlinks in the config file by setting nobacklinks to 0.
+
+It is backwards compatible, and by default enables backlinks in the generated pages.
+
+<code>
+--- IkiWiki/Render.pm.orig2	2009-01-06 14:54:01.000000000 +1300
++++ IkiWiki/Render.pm	2009-01-06 14:55:08.000000000 +1300
+@@ -107,7 +107,8 @@
+ 		$template->param(have_actions => 1);
+ 	}
+ 
+-	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
++	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page)
++		unless defined $config{nobacklinks} && $config{nobacklinks} == 0;
+ 	my ($backlinks, $more_backlinks);
+ 	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+ 		$backlinks=\@backlinks;
+</code>
-- 
cgit v1.2.3


From e1d94c08f05a57318e3a84bbe37effabfb1b2614 Mon Sep 17 00:00:00 2001
From: "http://puck42.myopenid.com/" <http://puck42.myopenid.com/@web>
Date: Mon, 5 Jan 2009 21:03:42 -0500
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/allow_disabling_backlinks.mdwn b/doc/todo/allow_disabling_backlinks.mdwn
index 8f2792082..5dd4876e8 100644
--- a/doc/todo/allow_disabling_backlinks.mdwn
+++ b/doc/todo/allow_disabling_backlinks.mdwn
@@ -2,7 +2,7 @@ This patch allows disabling the backlinks in the config file by setting nobackli
 
 It is backwards compatible, and by default enables backlinks in the generated pages.
 
-<code>
+<pre>
 --- IkiWiki/Render.pm.orig2	2009-01-06 14:54:01.000000000 +1300
 +++ IkiWiki/Render.pm	2009-01-06 14:55:08.000000000 +1300
 @@ -107,7 +107,8 @@
@@ -15,4 +15,4 @@ It is backwards compatible, and by default enables backlinks in the generated pa
  	my ($backlinks, $more_backlinks);
  	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
  		$backlinks=\@backlinks;
-</code>
+</pre>
-- 
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')

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')

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')

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')

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')

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')

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


From 1c2da36274b6dba4e8bb25b71a102c0a72a2a562 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Jan 2009 19:30:22 -0500
Subject: update

---
 doc/tips/upgrade_to_3.0.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/upgrade_to_3.0.mdwn b/doc/tips/upgrade_to_3.0.mdwn
index b8a75aeca..d22813bf2 100644
--- a/doc/tips/upgrade_to_3.0.mdwn
+++ b/doc/tips/upgrade_to_3.0.mdwn
@@ -37,8 +37,8 @@ following to your setup file:
 	
 	prefix_directives => 0,
 
-To convert to the new syntax, run 
-`ikiwiki-transition prefix_directives your.setup`
+To convert to the new syntax, make sure that your setup file does *not*
+contain the above, then run `ikiwiki-transition prefix_directives your.setup`
 
 (And then commit the changes it makes to pages in your srcdir.)
 
-- 
cgit v1.2.3


From 69c5a347f9a8304eac9c09196d1bbaf7d4437c51 Mon Sep 17 00:00:00 2001
From: test <test@web>
Date: Wed, 7 Jan 2009 04:49:12 -0500
Subject:

---
 doc/examples/softwaresite/bugs/test1.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/examples/softwaresite/bugs/test1.mdwn

(limited to 'doc')

diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn
new file mode 100644
index 000000000..00fd786fc
--- /dev/null
+++ b/doc/examples/softwaresite/bugs/test1.mdwn
@@ -0,0 +1,2 @@
+blah blah blah
+
-- 
cgit v1.2.3


From c21c7468b71913fa3a73226f14be20a2d243608b Mon Sep 17 00:00:00 2001
From: "http://evacuee.myid.net/" <http://evacuee.myid.net/@web>
Date: Wed, 7 Jan 2009 07:50:31 -0500
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 582d46e84..e1d85e50a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -83,3 +83,6 @@ The haiku will change after every save, mind you.
 This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+-----
+[[한글]]
-- 
cgit v1.2.3


From 10e511aee5432ac85e3353a4813546ed1d7dcecf Mon Sep 17 00:00:00 2001
From: "http://evacuee.myid.net/" <http://evacuee.myid.net/@web>
Date: Wed, 7 Jan 2009 07:53:35 -0500
Subject:

---
 "doc/sandbox/\355\225\234\352\270\200.mdwn" | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 "doc/sandbox/\355\225\234\352\270\200.mdwn"

(limited to 'doc')

diff --git "a/doc/sandbox/\355\225\234\352\270\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200.mdwn"
new file mode 100644
index 000000000..e0ba32639
--- /dev/null
+++ "b/doc/sandbox/\355\225\234\352\270\200.mdwn"
@@ -0,0 +1 @@
+~를 어떻게 할까~
-- 
cgit v1.2.3


From 666536f1800b9ff030d2c7326c599b0f82ee6e54 Mon Sep 17 00:00:00 2001
From: "http://evacuee.myid.net/" <http://evacuee.myid.net/@web>
Date: Wed, 7 Jan 2009 08:06:17 -0500
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index e1d85e50a..92899ea47 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -2,6 +2,7 @@ This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 testing 1..2..3!!
 
+[[한글페이지]]
 ----
 
 Here's a paragraph.
-- 
cgit v1.2.3


From 29c05eaff8155b1937c90f05a6ab0b881a136488 Mon Sep 17 00:00:00 2001
From: "http://evacuee.myid.net/" <http://evacuee.myid.net/@web>
Date: Wed, 7 Jan 2009 08:08:23 -0500
Subject:

---
 .../\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"  | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 "doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"

(limited to 'doc')

diff --git "a/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
new file mode 100644
index 000000000..4fac7976c
--- /dev/null
+++ "b/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
@@ -0,0 +1,2 @@
+
+Wow test
-- 
cgit v1.2.3


From b4957799375ac39cc0827623210fb53f5ee2ed20 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 12:29:37 -0500
Subject: remove clutter

---
 doc/examples/softwaresite/bugs/test1.mdwn | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 doc/examples/softwaresite/bugs/test1.mdwn

(limited to 'doc')

diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn
deleted file mode 100644
index 00fd786fc..000000000
--- a/doc/examples/softwaresite/bugs/test1.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-blah blah blah
-
-- 
cgit v1.2.3


From 11bac17272646a98fd233864e697f34ce47a7d79 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Wed, 7 Jan 2009 14:50:52 -0500
Subject:

---
 doc/sandbox.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 92899ea47..972f7fac4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -87,3 +87,7 @@ This SandBox is also a [[blog]]!
 
 -----
 [[한글]]
+
+--------
+
+This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
-- 
cgit v1.2.3


From 81b088866be5f55433c12e09c90e2ae404a8ed89 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 15:48:07 -0500
Subject: repolist: New plugin to support the rel=vcs-* microformat.

* repolist: New plugin to support the rel=vcs-* microformat.
* goodstuff: Include repolist by default. (But it does nothing until
  configured with the repository locations.)
---
 IkiWiki/Plugin/goodstuff.pm |  1 +
 IkiWiki/Plugin/repolist.pm  | 51 +++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog            |  3 +++
 doc/pagehistory.mdwn        |  3 +++
 doc/plugins/goodstuff.mdwn  |  1 +
 doc/plugins/repolist.mdwn   | 17 +++++++++++++++
 templates/page.tmpl         |  1 +
 7 files changed, 77 insertions(+)
 create mode 100644 IkiWiki/Plugin/repolist.pm
 create mode 100644 doc/plugins/repolist.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
index 46f2380cf..451cd6f84 100644
--- a/IkiWiki/Plugin/goodstuff.pm
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -22,6 +22,7 @@ my @bundle=qw{
 	template
 	toc
 	toggle
+	repolist
 };
 
 sub import {
diff --git a/IkiWiki/Plugin/repolist.pm b/IkiWiki/Plugin/repolist.pm
new file mode 100644
index 000000000..f69ec3988
--- /dev/null
+++ b/IkiWiki/Plugin/repolist.pm
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::repolist;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "repolist",  call => \&getsetup);
+	hook(type => "checkconfig", id => "repolist", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		repositories => {
+			type => "string",
+			example => ["svn://svn.example.org/wiki/trunk"],
+			description => "URIs of repositories containing the wiki's source",
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+my $relvcs;
+
+sub checkconfig () {
+	if (defined $config{rcs} && $config{repositories}) {
+		$relvcs=join("\n", map {
+			s/"//g; # avoid quotes just in case
+			qq{<link rel="vcs-$config{rcs}" href="$_" title="wiki $config{rcs} repository" />}
+		} @{$config{repositories}});
+		
+		hook(type => "pagetemplate", id => "repolist", call => \&pagetemplate);
+	}
+}
+
+sub pagetemplate (@) {
+	my %params=@_;
+	my $page=$params{page};
+	my $template=$params{template};
+	
+        if (defined $relvcs && $template->query(name => "relvcs")) {
+		$template->param(relvcs => $relvcs);
+	}
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index f4f9df041..74556906e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * table: Find links in external files in scan pass.
   * rename: Show full names of affected pages.
   * comments: Fix cache avoidance hack.
+  * repolist: New plugin to support the rel=vcs-* microformat.
+  * goodstuff: Include repolist by default. (But it does nothing until
+    configured with the repository locations.)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/pagehistory.mdwn b/doc/pagehistory.mdwn
index fc2a3f543..465062736 100644
--- a/doc/pagehistory.mdwn
+++ b/doc/pagehistory.mdwn
@@ -3,3 +3,6 @@ revison history of a page. This is enabled by the `historyurl` setting,
 which is used to specify the URL to a web interface such as [[ViewVC]]
 (for Subversion) or [[Gitweb]]. In that url, "\[[file]]" is replaced with
 the name of the file to view.
+
+The [[plugins/repolist]] plugin can suppliment this information with
+urls to the underlying repository of the wiki.
diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn
index ed57c0f01..ee1bffcfa 100644
--- a/doc/plugins/goodstuff.mdwn
+++ b/doc/plugins/goodstuff.mdwn
@@ -24,5 +24,6 @@ Currently included:
 * [[template]]
 * [[toc]]
 * [[toggle]]
+* [[repolist]]
 
 New plugins will be added to this bundle from time to time.
diff --git a/doc/plugins/repolist.mdwn b/doc/plugins/repolist.mdwn
new file mode 100644
index 000000000..9b3a7575e
--- /dev/null
+++ b/doc/plugins/repolist.mdwn
@@ -0,0 +1,17 @@
+[[!template id=plugin name=repolist author="[[Joey]]"]]
+[[!tag type/useful]]
+
+This plugin allows you to configure ikiwiki with the location of
+[[rcs]] repositories for your wiki's source. This is done via the
+"repositories" setting in the setup file. Once you tell it where the source
+to your wiki can be downloaded from, this information can be published on
+your wiki in various ways.
+
+This plugin supports the [rel-vcs-*](http://kitenet.net/~joey/rfc/rel-vcs/)
+microformat, and uses it to embed the repository location information in
+every wiki page.
+
+By using this plugin, you will make [[Joey]] very happy, as he will be able
+to easily check out the source of your wiki, for purposes of debugging and
+general curiosity. More generally, making it easy for others to find the
+repository for your wiki is just a Plain Good Idea(TM).
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f75491127..29ba688c7 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -13,6 +13,7 @@
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
 <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
-- 
cgit v1.2.3


From 800073556b99e97af843cdbbb2187e81247889e3 Mon Sep 17 00:00:00 2001
From: "http://tylerrick.com/" <http://tylerrick.com/@web>
Date: Wed, 7 Jan 2009 17:45:14 -0500
Subject:

---
 doc/sandbox.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 972f7fac4..bba24c372 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -91,3 +91,7 @@ This SandBox is also a [[blog]]!
 --------
 
 This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
+
+----
+
+Let's see what happens...
-- 
cgit v1.2.3


From 4bc545cff9bfb6d0dc6c76df253becc4e6cc6721 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 8 Jan 2009 13:21:44 -0500
Subject: new feature

---
 doc/todo/relative_pagespec_deficiency.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/todo/relative_pagespec_deficiency.mdwn

(limited to 'doc')

diff --git a/doc/todo/relative_pagespec_deficiency.mdwn b/doc/todo/relative_pagespec_deficiency.mdwn
new file mode 100644
index 000000000..9fdfe74b1
--- /dev/null
+++ b/doc/todo/relative_pagespec_deficiency.mdwn
@@ -0,0 +1,6 @@
+While a relative pagespec like `./posts/*` will work, when used in a page
+such as `bdale/blog`, you cannot do
+`created_after(./posts/foo)` -- only `glob()` supports relative page
+references.
+
+The other pagespec functions should too, where appropriate.
-- 
cgit v1.2.3


From 64c5a2237d0a51b237b0032850ea0a93443c0004 Mon Sep 17 00:00:00 2001
From: "http://foobak.myopenid.com/" <http://foobak.myopenid.com/@web>
Date: Thu, 8 Jan 2009 14:35:56 -0500
Subject:

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index bba24c372..70e7e931a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -92,6 +92,8 @@ This SandBox is also a [[blog]]!
 
 This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
 
+But, of course, rsync is better.
+
 ----
 
 Let's see what happens...
-- 
cgit v1.2.3


From f8baa57a37fe542ef7a8d8609ab4d8acf27016b3 Mon Sep 17 00:00:00 2001
From: "http://foobak.myopenid.com/" <http://foobak.myopenid.com/@web>
Date: Thu, 8 Jan 2009 14:37:40 -0500
Subject: foobak bak foo

---
 doc/sandbox/foobak.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/sandbox/foobak.mdwn

(limited to 'doc')

diff --git a/doc/sandbox/foobak.mdwn b/doc/sandbox/foobak.mdwn
new file mode 100644
index 000000000..c0b526f73
--- /dev/null
+++ b/doc/sandbox/foobak.mdwn
@@ -0,0 +1 @@
+Foobaka bakfoo.
-- 
cgit v1.2.3


From 7b3a21b5c1686ac14d7ae550ebf8fabd0ecaf666 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~gnprice" <https://launchpad.net/~gnprice@web>
Date: Thu, 8 Jan 2009 21:19:31 -0500
Subject:

---
 doc/sandbox.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 70e7e931a..8e38ea1e9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,7 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
+hello
+
 testing 1..2..3!!
 
 [[한글페이지]]
-- 
cgit v1.2.3


From 45411e43c19de5024b6372b32fdb22a46e3a0066 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~gnprice" <https://launchpad.net/~gnprice@web>
Date: Thu, 8 Jan 2009 22:15:47 -0500
Subject:

---
 doc/ikiwikiusers.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 0c45efa4f..7206e0e93 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,7 +2,7 @@ Projects
 ========
 
 * [This wiki](http://ikiwiki.info) (of course!)
-* [UK Software Patents info page](http://www.softwarepatents.co.uk/)
+* [UK Software Patents info page](http://www.softwarepatents.co.uk/) (really?)
 * [Planet Debian upstream](http://updo.debian.net/)
 * The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
@@ -22,10 +22,10 @@ Projects
 * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
 * The [libkdtree project](http://libkdtree.alioth.debian.org)
 * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project.  (Simple rcs backend)
-* [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
+* [The TOVA Company](http://www.tovatest.com) public site. (really still?  can't tell)  We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
-* The [awesome window manager homepage](http://awesome.naquadah.org/)
+* The [awesome window manager homepage](http://awesome.naquadah.org/) (really? can't tell)
 * [Enemies of Carlotta](http://www.e-o-c.org/)
 * [vcs-pkg](http://vcs-pkg.org)
 * [vcs-home](http://vcs-home.madduck.net)
-- 
cgit v1.2.3


From 391bc6a0b4b66037109a146853b822f824e88e85 Mon Sep 17 00:00:00 2001
From: testaroo <testaroo@web>
Date: Fri, 9 Jan 2009 11:47:25 -0500
Subject:

---
 doc/nu_page.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/nu_page.mdwn

(limited to 'doc')

diff --git a/doc/nu_page.mdwn b/doc/nu_page.mdwn
new file mode 100644
index 000000000..484ba93ef
--- /dev/null
+++ b/doc/nu_page.mdwn
@@ -0,0 +1 @@
+This is a test.
-- 
cgit v1.2.3


From 66ec8c407b4f8beb21287cf1c3aa784b51bada5f Mon Sep 17 00:00:00 2001
From: testaroo <testaroo@web>
Date: Fri, 9 Jan 2009 11:47:39 -0500
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8e38ea1e9..c9d75e696 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,6 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
+[[nu page]]
 hello
 
 testing 1..2..3!!
-- 
cgit v1.2.3


From 1b717b95c700bbbf78aa867f36301ab7d7246653 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Jan 2009 19:26:26 -0500
Subject: remove clutter

---
 doc/nu_page.mdwn | 1 -
 doc/sandbox.mdwn | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 doc/nu_page.mdwn

(limited to 'doc')

diff --git a/doc/nu_page.mdwn b/doc/nu_page.mdwn
deleted file mode 100644
index 484ba93ef..000000000
--- a/doc/nu_page.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This is a test.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c9d75e696..8e38ea1e9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,5 @@
 This is the SandBox, a page anyone can edit to try out ikiwiki.
 
-[[nu page]]
 hello
 
 testing 1..2..3!!
-- 
cgit v1.2.3


From 8b084a132733399521e7fa48031795598142f62e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Jan 2009 19:28:43 -0500
Subject: remove questions

ikiwiki has some pretty distinct fingerprints even when it's used
in unusual ways on sites that don't make it obvious it's being used:

* tova: a) rss and atom feed buttons
   b) use of toc plugin on some pages
   c) usual page.tmpl droppings
   d) (I know the tova guys :)
* awesome: a) usual page.tmpl droppings
  b) ikiwiki/ page and rest of basewiki pages exist
* UK software patents: used to use ikiwiki based on similar
  fingerprints, but not now. Removed
---
 doc/ikiwikiusers.mdwn | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 7206e0e93..ade15d080 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,7 +2,6 @@ Projects
 ========
 
 * [This wiki](http://ikiwiki.info) (of course!)
-* [UK Software Patents info page](http://www.softwarepatents.co.uk/) (really?)
 * [Planet Debian upstream](http://updo.debian.net/)
 * The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
@@ -22,10 +21,10 @@ Projects
 * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
 * The [libkdtree project](http://libkdtree.alioth.debian.org)
 * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project.  (Simple rcs backend)
-* [The TOVA Company](http://www.tovatest.com) public site. (really still?  can't tell)  We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
+* [The TOVA Company](http://www.tovatest.com) public site.  We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
-* The [awesome window manager homepage](http://awesome.naquadah.org/) (really? can't tell)
+* The [awesome window manager homepage](http://awesome.naquadah.org/)
 * [Enemies of Carlotta](http://www.e-o-c.org/)
 * [vcs-pkg](http://vcs-pkg.org)
 * [vcs-home](http://vcs-home.madduck.net)
-- 
cgit v1.2.3


From 81b87d41fb2efb5d5e1b365fcde7d5e2a2f7ce91 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 10 Jan 2009 11:41:41 +0000
Subject: Request review for my comments branch

Partially addresses [[todo/comments]]
---
 doc/todo/comments.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 832441be1..e8698f721 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -10,6 +10,8 @@
   > it's hard enough to get some people to title their blog posts :-)
   > --[[smcv]]
 
+## Patches pending merge
+
 * If a spammer posts a comment, it is either impossible or hard to clean
   up via the web. Would be nice to have some kind of link on the comment
   that allows trusted users to remove it (using the remove plugin of
@@ -23,7 +25,9 @@
   > So that took about 10 days...
   > --[[Joey]] 
 
-## Patches pending merge
+  >> Implemented in my 'comments' branch, please review. It turns out
+  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
+  >> easy to do. --[[smcv]]
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
   should probably be shared
-- 
cgit v1.2.3


From af9566a6952905beff7f1ca9db64f01c3faf4ff2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Jan 2009 14:17:27 -0500
Subject: comments: Add support for removing comments via web interface. (smcv)

---
 debian/changelog       |  1 +
 doc/todo/comments.mdwn | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 74556906e..61aee299d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * repolist: New plugin to support the rel=vcs-* microformat.
   * goodstuff: Include repolist by default. (But it does nothing until
     configured with the repository locations.)
+  * comments: Add support for removing comments via web interface. (smcv)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index e8698f721..c74ded8f6 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -12,23 +12,6 @@
 
 ## Patches pending merge
 
-* If a spammer posts a comment, it is either impossible or hard to clean
-  up via the web. Would be nice to have some kind of link on the comment
-  that allows trusted users to remove it (using the remove plugin of
-  course).
-
-  > Won't the remove plugin refuse to remove internal pages? This would be
-  > a good feature to have, though. --[[smcv]]
-
-  > Here, FWIW, is the first ikiwiki comment spam I've seen:
-  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
-  > So that took about 10 days...
-  > --[[Joey]] 
-
-  >> Implemented in my 'comments' branch, please review. It turns out
-  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
-  >> easy to do. --[[smcv]]
-
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
   should probably be shared
 
@@ -151,3 +134,22 @@
   first. --[[smcv]]
 
   > done --[[Joey]]
+
+* If a spammer posts a comment, it is either impossible or hard to clean
+  up via the web. Would be nice to have some kind of link on the comment
+  that allows trusted users to remove it (using the remove plugin of
+  course).
+
+  > Won't the remove plugin refuse to remove internal pages? This would be
+  > a good feature to have, though. --[[smcv]]
+
+  > Here, FWIW, is the first ikiwiki comment spam I've seen:
+  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
+  > So that took about 10 days...
+  > --[[Joey]] 
+
+  >> Implemented in my 'comments' branch, please review. It turns out
+  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
+  >> easy to do. --[[smcv]]
+
+  >>> done --[[Joey]] 
-- 
cgit v1.2.3


From 7a8ea68fc0bba9f75ba81a9547d359f42e31caa4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Jan 2009 14:36:03 -0500
Subject: Consistently allow use of relative paths in all PageSpecs that take a
 page name parameter. Previously, match_created_before(),
 match_created_after(), match_sourcepage(), and match_destpage() did not
 support that, and the docs were not clear.

---
 IkiWiki.pm                                 | 6 ++++++
 IkiWiki/Plugin/conditional.pm              | 4 ++++
 debian/changelog                           | 4 ++++
 doc/todo/relative_pagespec_deficiency.mdwn | 2 ++
 4 files changed, 16 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 892b5b5a8..4601d8590 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1880,6 +1880,9 @@ sub match_backlink ($$;@) {
 sub match_created_before ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
+	my %params=@_;
+	
+	$testpage=derel($testpage, $params{location});
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
@@ -1897,6 +1900,9 @@ sub match_created_before ($$;@) {
 sub match_created_after ($$;@) {
 	my $page=shift;
 	my $testpage=shift;
+	my %params=@_;
+	
+	$testpage=derel($testpage, $params{location});
 
 	if (exists $IkiWiki::pagectime{$testpage}) {
 		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 4f3577b34..7445dbdad 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -87,6 +87,8 @@ sub match_sourcepage ($$;@) {
 	shift;
 	my $glob=shift;
 	my %params=@_;
+	
+	$glob=derel($glob, $params{location});
 
 	return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
 	if (match_glob($params{sourcepage}, $glob, @_)) {
@@ -102,6 +104,8 @@ sub match_destpage ($$;@) {
 	my $glob=shift;
 	my %params=@_;
 	
+	$glob=derel($glob, $params{location});
+
 	return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
 	if (match_glob($params{destpage}, $glob, @_)) {
 		return IkiWiki::SuccessReason->new("destpage matches $glob");
diff --git a/debian/changelog b/debian/changelog
index 61aee299d..13ef9afed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ikiwiki (3.02) UNRELEASED; urgency=low
   * goodstuff: Include repolist by default. (But it does nothing until
     configured with the repository locations.)
   * comments: Add support for removing comments via web interface. (smcv)
+  * Consistently allow use of relative paths in all PageSpecs
+    that take a page name parameter. Previously, match_created_before(),
+    match_created_after(), match_sourcepage(), and match_destpage()
+    did not support that, and the docs were not clear.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 06 Jan 2009 15:02:52 -0500
 
diff --git a/doc/todo/relative_pagespec_deficiency.mdwn b/doc/todo/relative_pagespec_deficiency.mdwn
index 9fdfe74b1..4500581c7 100644
--- a/doc/todo/relative_pagespec_deficiency.mdwn
+++ b/doc/todo/relative_pagespec_deficiency.mdwn
@@ -4,3 +4,5 @@ such as `bdale/blog`, you cannot do
 references.
 
 The other pagespec functions should too, where appropriate.
+
+[[done]]
-- 
cgit v1.2.3


From 52c30dd9f3701a7782a8d77ea70d894087eaa473 Mon Sep 17 00:00:00 2001
From: "http://evacuee.myid.net/" <http://evacuee.myid.net/@web>
Date: Sun, 11 Jan 2009 04:37:32 -0500
Subject:

---
 doc/sandbox.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8e38ea1e9..00b57815d 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,7 +4,6 @@ hello
 
 testing 1..2..3!!
 
-[[한글페이지]]
 ----
 
 Here's a paragraph.
@@ -87,9 +86,6 @@ This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
 
------
-[[한글]]
-
 --------
 
 This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net
@@ -98,4 +94,4 @@ But, of course, rsync is better.
 
 ----
 
-Let's see what happens...
+Let's see what happens... ~~
-- 
cgit v1.2.3


From 7b1026b1a803e160c360ee8f4d19004b466f8b7c Mon Sep 17 00:00:00 2001
From: tobias_verbeke <tobias_verbeke@web>
Date: Sun, 11 Jan 2009 16:04:32 -0500
Subject:

---
 doc/tips/markdown_and_eclipse.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/tips/markdown_and_eclipse.mdwn

(limited to 'doc')

diff --git a/doc/tips/markdown_and_eclipse.mdwn b/doc/tips/markdown_and_eclipse.mdwn
new file mode 100644
index 000000000..9e8e9bfa9
--- /dev/null
+++ b/doc/tips/markdown_and_eclipse.mdwn
@@ -0,0 +1,4 @@
+For people that were not born with GNU emacs fingers, 
+there is a markdown editor (with preview and outline)
+for [eclipse](http://www.eclipse.org) available 
+[here](http://www.winterwell.com/software/markdown-editor.php).
-- 
cgit v1.2.3