aboutsummaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-05-28 11:38:28 +0200
committerintrigeri <intrigeri@boum.org>2012-05-28 11:38:28 +0200
commit8eb8755aebbe12825de076b6eac9639805d79354 (patch)
treea572e5e22e5e12a702eb41d860ae9bdea29a48fd /doc/todo
parentba06aefa5ab9105e2cb08ec58f4b7ac34c88c2b4 (diff)
downloadikiwiki-8eb8755aebbe12825de076b6eac9639805d79354.tar
ikiwiki-8eb8755aebbe12825de076b6eac9639805d79354.tar.gz
Ping'ing Joey.
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index baad063ef..ca9cb532c 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -80,6 +80,11 @@ and decided this time it was really needed to implement this feature.
>>>>>> Ping? I've merged 3.20110321 in my `mirrorlist` branch and
>>>>>> checked it still works properly. --[[intrigeri]]
+>>>>>>> Joey: ping? I've rebased my `mirrorlist` branch on top of
+>>>>>>> 3.20120419, and checked it still works properly. I really
+>>>>>>> would like to see this functionality merged in time
+>>>>>>> for Wheezy. --[[intrigeri]]
+
>>>>> concerning goto/cgiurl, what about having that as the default in
>>>>> mirrorlist, but keeping ``nousedirs|file:///home/intrigeri/wiki`` and
>>>>> ``usedirs|http://example.com/wiki`` valid for cgi-less cases?