summaryrefslogtreecommitdiff
path: root/src/websockets/doc/src/overview.qdoc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-25 11:03:47 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-25 11:03:47 +0100
commitdfc91928f15302fa4e6c41802c60caec2c124942 (patch)
tree7c32786f83a45d9d8de8d989e9d54dcc0982d4e5 /src/websockets/doc/src/overview.qdoc
parenta0aec91b676e2b79b8e66091d55d9e128bf2a1d0 (diff)
parent670266a075c7c312c6a7f9465298bfec0b968ee2 (diff)
downloadqtwebsockets-dfc91928f15302fa4e6c41802c60caec2c124942.tar.gz
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: .qmake.conf Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f
Diffstat (limited to 'src/websockets/doc/src/overview.qdoc')
-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.