aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-08-30 13:37:16 -0400
committerJoey Hess <joey@kitenet.net>2010-08-30 13:37:16 -0400
commit00a54d1bb7826455609645aa1d0ea66cfec3f468 (patch)
tree883da41843c4c672d0cb5ecda9317eaa4b36fd1b
parent991d01f5b53250b962725110903b0324c93fbfb6 (diff)
downloadikiwiki-00a54d1bb7826455609645aa1d0ea66cfec3f468.tar
ikiwiki-00a54d1bb7826455609645aa1d0ea66cfec3f468.tar.gz
finish link(.) support
-rw-r--r--debian/changelog1
-rw-r--r--doc/ikiwiki/pagespec.mdwn6
-rw-r--r--doc/todo/support_link__40__.__41___in_pagespec.mdwn8
3 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 0d36a7352..eba38c4d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
* Danish translation update. Closes: #594673
* highlight: Make location of highlight's files configurable in setup
file to allow for nonstandard installations.
+ * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta.
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 7fabff9a4..6aec561ae 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -79,6 +79,6 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page
relative to the directory of the page containing the pagespec, you can
use "./". For example, "./foo" on page "a/b" matches page "a/foo".
-If you want to use the name of the page the pagespec is used in, you can use
-a single dot. For example, `link(.)` matches all the pages linking to the
-current page.
+To indicate the name of the page the PageSpec is used in, you can
+use a single dot. For example, `link(.)` matches all the pages
+linking to the page containing the PageSpec.
diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
index 79809662a..653db1ff2 100644
--- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn
+++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn
@@ -11,3 +11,11 @@ IkiWiki.pm is the best way to do it".
> I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]].
> An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar.
> -- GB
+
+>> Thanks for this, and also for your recent spam-fighting.
+>> Huh, I was right about changing derel, didn't realize it would be
+>> so obvious a change. :) Oh well, I managed to complicate it
+>> some in optimisation pass.. ;)
+>>
+>> Note that your git-daemon on git.oblomov.eu seems down.
+>> I pulled the patch from gitweb, [[done]] --[[Joey]]