summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 11:56:39 (GMT)
committerLiang Qi <liang.qi@qt.io>2016-11-26 11:56:39 (GMT)
commit5e66a1c5d25caef259e6e8b41023004c2b8de355 (patch)
tree4ff0211df5cfde193d9d6c5b489ee00a468a5bff /src
parentccb138548314a767a897496c74c04a261a391027 (diff)
parent1f6a55f97dce97d4d2fe62b8b6a87c18d4f2627d (diff)
downloadqtwebsockets-5e66a1c5d25caef259e6e8b41023004c2b8de355.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f
Diffstat (limited to 'src')
-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.