Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/websockets/doc/echoclient.qdoc b/examples/websockets/doc/echoclient.qdoc
index a6cb1a9..2c64169 100644
--- a/examples/websockets/doc/echoclient.qdoc
+++ b/examples/websockets/doc/echoclient.qdoc
@@ -43,9 +43,9 @@
     \example echoclient
     \title Echo Client Example
     \ingroup qtwebsockets-examples
-    \brief Describes how to use the websocket API for creating a simple echo client.
+    \brief Describes how to use the WebSocket API for creating a simple echo client.
 
-    The Echo Client Example shows how to use the websocket API to create a simple
+    The Echo Client Example shows how to use the WebSocket API to create a simple
     echo client.
 
     \sa {Echo Server Example}