Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / news / server_speed.mdwn

diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn
index c2fe3656e577d887b7e5109a3f3c4bb9205c7250..60ce59d422b30cf3575244058468b0cf717fdefe 100644 (file)
--- a/doc/news/server_speed.mdwn
+++ b/doc/news/server_speed.mdwn
@@ -1,15 +1,9 @@
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or
 Quick poll: Do you feel that ikiwiki is fast enough on this server, or

-should I move it to my much beefier auxillary server?
+should I move it to my much beefier auxiliary server?

 
 

-[[poll 0 "It's fast enough" 0 "It's too slow!" 0 "No opinion"]]
+[[!poll open=no 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]]

 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
 
 
 If you have specifics on performance issues, you might mention them on the
 [[discussion]] page.
 

-The current server is a single processor 2.8 ghz Sepron machine shared
-amoung 4 other xen instances, and often 
-[heavily loaded](http://bluebird.kitenet.net/munin/kitenet.net/wren.kitenet.net-load.html)
-by extraneous stuff like spamassassin and compiles. The auxillary server is
-a dual processor, dual core 2 ghz Opteron shared with other xen instances
-(exact number not available from provider), but with
-[little other load](http://bluebird.kitenet.net/munin/kitenet.net/bluebird.kitenet.net-load.html).
+Ikiwiki is now hosted at [Branchable](http://branchable.com/).