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

2008-02-03 00:32:15 -05:00 · 2008-02-03 00:32:15 -05:00 · 89000b48f3
parent 9f60272831 f77de93291
commit 89000b48f3
2 changed files with 2 additions and 2 deletions
--- 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.
--- a/doc/sandbox/test2.mdwn
+++ b/doc/sandbox/test2.mdwn
@ -1 +1 @@
-test
+testing..