diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-28 20:21:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-28 20:21:10 -0400 |
| commit | debdfd45d52d1b200f61d298e0b72a87327d4aae (patch) | |
| tree | cdac52f06ebf176c9b96db5a0e4e6a166f715f2c | |
| parent | decf432fd53d85a81cc4e8904b1ee04d64d6ce3c (diff) | |
| parent | f398ad035b973608d380c9939ea845d8e2a0cdc2 (diff) | |
| download | ikiwiki-debdfd45d52d1b200f61d298e0b72a87327d4aae.tar ikiwiki-debdfd45d52d1b200f61d298e0b72a87327d4aae.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 1 | ||||
| -rw-r--r-- | doc/sandbox.mdwn | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index e76d547cc..2f70c67b7 100644 --- 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! diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 01308dae4..365cb3321 100644 --- 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"]] |