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

3 files changed, 15 insertions, 1 deletions

diff --git a/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn
new file mode 100644
index 000000000..07e925a03
--- /dev/null
+++ b/doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn
@@ -0,0 +1,11 @@
+The po plugin needs to be updated to match the urlto sub API and
+signature changes. Else a wiki with the po plugin enabled cannot be
+refreshed / rebuilt because of (correct) Perl errors.
+
+My po branch contains a fix.
+
+Also, I fear the lack of any useful `$from` parameter might break some
+l10n'd link niceness when using `po_link_to = current` but I have not
+investigated this yet.
+
+--[[intrigeri]]
diff --git a/doc/sandbox/D-Liberative.wiki b/doc/sandbox/D-Liberative.wiki
deleted file mode 100644
index b8c94f310..000000000
--- a/doc/sandbox/D-Liberative.wiki
+++ /dev/null
@@ -1 +0,0 @@
-For now its just a concept... what if a community could map its deliberative capacity?
diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
index 88c82f66c..31e62f44c 100644
--- a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
+++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn
@@ -72,3 +72,7 @@ and decided this time it was really needed to implement this feature.
 >>>> Have to wonder if it wouldn't perhaps be better to do something
 >>>> using the goto plugin and cgiurl, so that the mirror doesn't have
 >>>> to know about the configuration of the other mirror. --[[Joey]]
+
+>>>>> I have implemented something using the cgi + goto in my (history
+>>>>> rewrite warning) mirrorlist branch. Please review, please pull.
+>>>>> --[[intrigeri]]