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

Change-Id: Idec54e19963e8d88c711cb179cffc81596323899

4 files changed, 7 insertions, 7 deletions

diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 5b7274e3e6..b555c885b1 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -129,7 +129,7 @@ QT_BEGIN_NAMESPACE
     \value SecureProtocols The default option, using protocols known to be secure;
     currently behaves like TlsV1SslV3.
 
-    Note: most servers using SSL understand both versions (2 and 3),
+    \note most servers using SSL understand both versions (2 and 3),
     but it is recommended to use the latest version only for security
     reasons. However, SSL and TLS are not compatible with each other:
     if you get unexpected handshake failures, verify that you chose
@@ -176,7 +176,7 @@ QT_BEGIN_NAMESPACE
     SslOptionDisableSessionPersistence is turned on to optimize memory usage.
     The other options are turned off.
 
-    Note: Availability of above options depends on the version of the SSL
+    \note Availability of above options depends on the version of the SSL
     backend in use.
 */
 
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index 3b59b0e3ce..64b75f98ec 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -657,7 +657,7 @@ bool QSslConfiguration::testSslOption(QSsl::SslOption option) const
   used or QSsl::SslOptionDisableSessionPersistence was not turned off,
   this function returns an empty QByteArray.
 
-  \b{Note:} When persisting the session ticket to disk or similar, be
+  \note When persisting the session ticket to disk or similar, be
   careful not to expose the session to a potential attacker, as
   knowledge of the session allows for eavesdropping on data
   encrypted with the session parameters.
diff --git a/src/network/ssl/qsslcontext.cpp b/src/network/ssl/qsslcontext.cpp
index 551804ec79..1634ba0649 100644
--- a/src/network/ssl/qsslcontext.cpp
+++ b/src/network/ssl/qsslcontext.cpp
@@ -349,7 +349,7 @@ SSL* QSslContext::createSsl()
 // We cache exactly one session here
 bool QSslContext::cacheSession(SSL* ssl)
 {
-    // dont cache the same session again
+    // don't cache the same session again
     if (session && session == q_SSL_get_session(ssl))
         return true;
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 419bf0bf30..04c0fb0487 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -283,7 +283,7 @@
     \a errors contains one or more errors that prevent QSslSocket from
     verifying the identity of the peer.
 
-    Note: You cannot use Qt::QueuedConnection when connecting to this signal,
+    \note You cannot use Qt::QueuedConnection when connecting to this signal,
     or calling QSslSocket::ignoreSslErrors() will have no effect.
 
     \sa peerVerifyError()
@@ -400,7 +400,7 @@ void QSslSocket::resume()
 
     \snippet code/src_network_ssl_qsslsocket.cpp 3
 
-    \b{Note:} The example above shows that text can be written to
+    \note The example above shows that text can be written to
     the socket immediately after requesting the encrypted connection,
     before the encrypted() signal has been emitted. In such cases, the
     text is queued in the object and written to the socket \e after
@@ -470,7 +470,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port,
     The socket is opened in the mode specified by \a openMode, and
     enters the socket state specified by \a state.
 
-    \b{Note:} It is not possible to initialize two sockets with the same
+    \note It is not possible to initialize two sockets with the same
     native socket descriptor.
 
     \sa socketDescriptor()