summaryrefslogtreecommitdiff
path: root/src/websockets
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-17 22:55:59 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-17 22:55:59 +0200
commit6bef834d17ea9978b99e309eb396e10c8b9fba4c (patch)
treee942eb5e0c7dec57de7db58498408d11d1594c4c /src/websockets
parent38d830d00fc2f8c196d736094448e55623e4b35e (diff)
parentef7b03e3e5e20f89963bae799f7ecb753f332c34 (diff)
downloadqtwebsockets-6bef834d17ea9978b99e309eb396e10c8b9fba4c.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I912302259dc84aa15ca8bb8a498c5c5b148c2864
Diffstat (limited to 'src/websockets')
-rw-r--r--src/websockets/doc/src/overview.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/doc/src/overview.qdoc b/src/websockets/doc/src/overview.qdoc
index eb9e429..e85461a 100644
--- a/src/websockets/doc/src/overview.qdoc
+++ b/src/websockets/doc/src/overview.qdoc
@@ -39,7 +39,7 @@ Historically, web applications that needed bidirectional communication or
push notifications had to use one of the HTTP-based solutions available. These
solutions employed different techniques such as polling, long-polling, and
streaming, to overcome the limitations of HTTP protocol, which is not designed
-for such use cases. As a result, high network latency, unnecessary data
+for such use cases. This resulted in high network latency, unnecessary data
exchange, and stale or old data. The WebSocket offering by IETF helps to
overcome these problems to a large extent.