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

doc/bugs/nested_inlines_produce_no_output.mdwn

@@ -0,0 +1,10 @@
+If an inlined page itself contains an inline directive, the nested directive will produce no output.  In [this example wiki](http://www.willthompson.co.uk/tmp/ikiwiki-nested-inline/), the following pages exist:
+
+ * _pets_: contains some content, and the directive `inline pages="pets/* and !pets/*/*"` to inline its immediate children.
+ * _pets/dogs_: some content, and `inline pages="pets/dogs/*"`.
+ * _pets/dogs/fifi_, _pets/dogs/rover_: content.
+ * _pets/cats_, _pets/cats/mumu_, _pets/cats/ceefer_: similar.
+
+When rendered, _pets_ [contains](http://www.willthompson.co.uk/tmp/ikiwiki-nested-inline/output/pets/) the content from _pets/dogs_ and _pets/cats_, but not the pages inlined into them.  However, the subpages [correctly](http://www.willthompson.co.uk/tmp/ikiwiki-nested-inline/output/pets/dogs/) [include](http://www.willthompson.co.uk/tmp/ikiwiki-nested-inline/output/pets/cats/) their own children.
+
+This used to work in at least ikiwiki 1.45.  I stepped through `preprocess_inline`, but couldn't see why this wasn't working.

doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn

@@ -0,0 +1,5 @@
+##Why?
+* Because I can do things like this
+* Because I can use my favourite SCM, as the rest of my project elements (that's the only reason I complain about Trac...)
+* Because the perfect tool does not exist, but custommizing very simple approaches like this I can build my own
+* Because I'm just adding a new topic to see how diff works

doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn

@@ -0,0 +1 @@
+Perhaps

doc/sandbox/test_nested_inlines.mdwn

@@ -0,0 +1,3 @@
+Testing nested inlines:
+
+[[inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]