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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 22a5642da0fb61d233846f49469a1c397cbe07c7..1f842d499ee19639f0957ffd3f9ec65ae093e5d7 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -44,7 +44,7 @@ Bulleted list
 [[!haiku hint="sandbox play"]]
 
 ----
-
+blah
 ## Different sorts of links:
 
 * [[Features]]

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 8a4b852b7b19e598a65ccbedc11339887520a1b8..fb942a49552246a0d56ca5e32c6e75d2a85ea0c1 100644 (file)
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -10,4 +10,8 @@ those contents instead.
 
 
 --[[madduck]]
+
+> In mine I just copied sidebar out and made some extra "sidebars", but they go elsewhere. Ugly hack, but it works. --[[simonraven]]
+
+
 [[!tag wishlist]]

diff --git a/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
new file mode 100644 (file)
index 0000000..f6ccaf5
--- /dev/null
+++ b/doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn
@@ -0,0 +1,7 @@
+## sort= parameter
+
+Having a `sort=` parameter for the map plugin/directive would be real nice; like `inline`'s parameter, with `age`, `title`, etc.
+
+I may hack one in from `inline` if it seem within my skill level.
+
+[[!tag wishlist]]