From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 05:32:15 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~52
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/89000b48f3cb809b13aa64db79abb90d446458b9?hp=9f602728316096f235b3b28e7daacc7ece69bbd4

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

diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index 9ff0e9824..cbb9513a9 100644
--- a/doc/news/server_speed.mdwn
+++ b/doc/news/server_speed.mdwn
@@ -1,7 +1,7 @@
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or
 should I move it to my much beefier auxiliary server?
 
-[[poll 40 "It's fast enough" 4 "It's too slow!" 4 "No opinion"]]
+[[poll 40 "It's fast enough" 5 "It's too slow!" 4 "No opinion"]]
 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
diff --git a/doc/sandbox/test2.mdwn b/doc/sandbox/test2.mdwn
index 9daeafb98..5dd1d4caf 100644
--- a/doc/sandbox/test2.mdwn
+++ b/doc/sandbox/test2.mdwn
@@ -1 +1 @@
-test
+testing..