From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 15 Apr 2013 22:41:10 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/cubemap
X-Git-Tag: 1.0.0~102
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4cb5673a180d4a963f4d9404ebf4905e7131d30e;hp=5ad72898a682d78330f206c0aa1b8f73f0baf122;p=cubemap

Merge branch 'master' of /srv/git.sesse.net/www/cubemap
---

diff --git a/README b/README
index a869221..4410010 100644
--- a/README
+++ b/README
@@ -3,10 +3,10 @@ specifically made for use with VLC. It is currently in alpha stage.
 
 A short list of features:
 
- - High-performance. Exactly how high-performance remains to be seen,
-   but it is designed to go to 10 Gbit/sec and beyond, through a
-   design with multiple worker threads, epoll and sendfile
-   (yes, sendfile).
+ - High-performance, through a design with multiple worker threads,
+   epoll and sendfile (yes, sendfile); a 2GHz quadcore can saturate
+   10 gigabit Ethernet, given a modern kernel, a modern NIC
+   and the right kernel tuning.
  - High-availability. You can change any part of the configuration
    (and even upgrade to a newer version of Cubemap) by changing cubemap.config
    and sending a SIGHUP; all clients will continue as if nothing had happened