aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-02-03 00:32:15 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-02-03 00:32:15 -0500
commit89000b48f3cb809b13aa64db79abb90d446458b9 (patch)
tree26f322b3bc722651ce68e9ac7db4321e5b40d4f2
parent9f602728316096f235b3b28e7daacc7ece69bbd4 (diff)
parentf77de93291700a4618a49988066c9b8be43f2c7e (diff)
downloadikiwiki-89000b48f3cb809b13aa64db79abb90d446458b9.tar
ikiwiki-89000b48f3cb809b13aa64db79abb90d446458b9.tar.gz
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
-rw-r--r--doc/news/server_speed.mdwn2
-rw-r--r--doc/sandbox/test2.mdwn2
2 files changed, 2 insertions, 2 deletions
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..