aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-09-13 18:45:45 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-09-13 18:45:45 -0400
commit5e0beca452f7feb019a5d16908b61a233c112c0e (patch)
tree93ac6957e007149b5d4ff1b49389c765e6b81f49
parent2b07f393511fd1bfb5fc3f1edbc2d87b061d617d (diff)
parentf146bd0cf8f8fb661fe8690cd3246aa6ba6225f4 (diff)
downloadikiwiki-5e0beca452f7feb019a5d16908b61a233c112c0e.tar
ikiwiki-5e0beca452f7feb019a5d16908b61a233c112c0e.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/sandbox.mdwn2
-rw-r--r--doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn4
-rw-r--r--doc/todo/sort_parameter_for_map_plugin_and_directive.mdwn7
3 files changed, 12 insertions, 1 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 22a5642da..1f842d499 100644
--- 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 8a4b852b7..fb942a495 100644
--- 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
index 000000000..f6ccaf538
--- /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]]