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 9ff0e9824ffe60bca04c9600e000ad40ffb20d6e..cbb9513a95e5cb88be9a449c3c9dbaa8e68f2f53 100644 (file)
--- 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 9daeafb9864cf43055ae93beb0afd6c7d144bfa4..5dd1d4caf838c89b649e02cbd15fa0a2de36d927 100644 (file)
--- a/doc/sandbox/test2.mdwn
+++ b/doc/sandbox/test2.mdwn
@@ -1 +1 @@
-test
+testing..