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

2010-08-28 20:21:10 -04:00 · 2010-08-28 20:21:10 -04:00 · debdfd45d5
parent decf432fd5 f398ad035b
commit debdfd45d5
2 changed files with 3 additions and 0 deletions
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@ -158,6 +158,7 @@ Personal sites and blogs
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
 * [Thomas Kane](http://planetkane.org/)
+* [Marco Silva](http://marcot.eti.br/) a weblog + wiki using the [darcs](http://darcs.net) backend

 Please feel free to add your own ikiwiki site!

--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@ -49,8 +49,10 @@ Bulleted list
 * <test.html>

 <google.de>
+<http://www.perl.it>
 ----

 This **SandBox** is also a [[blog]]!
+[[!inline  pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]

 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]