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

diff --git a/doc/examples/blog/posts/hthn.mdwn b/doc/examples/blog/posts/hthn.mdwn
new file mode 100644 (file)
index 0000000..8fb80c2
--- /dev/null
+++ b/doc/examples/blog/posts/hthn.mdwn
@@ -0,0 +1 @@
+thonk

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3a810a731d084adc1c839a707697ccae84bee16e..d14e4898ce2ef63160d4a7695542e4114df9c9d6 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -194,7 +194,7 @@ Personal sites and blogs
 * [Salient Dream](http://www.salientdream.com/) - All Things Strange. 
 * [Anton Berezin's blog](http://blog.tobez.org/)
 * [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany.
-* [Frohdo](https://frohdo.de) - With raw food against back pain and other diseases
+* [Waldfarm](https://waldfarm.de) - Natural Life by Natural Farming, Natürliches Leben mit natürlicher Landwirtschaft
 * [[OscarMorante]]'s [personal site](http://oscar.morante.eu).
 * [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.  
 * [[LucaCapello]]'s [homepage](http://luca.pca.it)