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

Change-Id: I566eb2a607c59bf80a50a411dd4311f39c72e2c8

3 files changed, 9 insertions, 9 deletions

diff --git a/src/serialbus/qmodbuspdu.cpp b/src/serialbus/qmodbuspdu.cpp
index 57398b9..c42352d 100644
--- a/src/serialbus/qmodbuspdu.cpp
+++ b/src/serialbus/qmodbuspdu.cpp
@@ -320,7 +320,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ
 
     \note Usage is limited \c quint8 and \c quint16 only. This is because
     \c QDataStream stream operators will not only append raw data, but also
-    e.g. size, count etc. for complex types.
+    e.g. size, count, etc. for complex types.
 */
 
 /*!
@@ -412,7 +412,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ
 
     \note Usage is limited \c quint8 and \c quint16 only. This is because
     \c QDataStream stream operators will not only append raw data, but also
-    e.g. size, count etc. for complex types.
+    e.g. size, count, etc. for complex types.
 */
 
 /*!
@@ -428,7 +428,7 @@ static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type typ
 
     \note Usage is limited \c quint8 and \c quint16 only. This is because
     \c QDataStream stream operators will not only append raw data, but also
-    e.g. size, count etc. for complex types.
+    e.g. size, count, etc. for complex types.
 */
 
 /*!
@@ -481,7 +481,7 @@ QDataStream &operator<<(QDataStream &stream, const QModbusPdu &pdu)
     \note When using the constructor taking the \c QByteArray, please make sure to convert the
         containing data to big-endian byte order before creating the request.
 
-    The same request can be created like this, if the values are know at compile time:
+    The same request can be created like this, if the values are known at compile time:
     \code
         quint16 startAddress = 19, numberOfCoils = 10;
         quint8 payloadInBytes = 2, outputHigh = 0xcd, outputLow = 0x01;
@@ -517,7 +517,7 @@ QDataStream &operator<<(QDataStream &stream, const QModbusPdu &pdu)
 
     \note Usage is limited \c quint8 and \c quint16 only. This is because
     \c QDataStream stream operators will not only append raw data, but also
-    e.g. size, count etc. for complex types.
+    e.g. size, count, etc. for complex types.
 */
 
 /*!
@@ -638,7 +638,7 @@ QDataStream &operator>>(QDataStream &stream, QModbusRequest &pdu)
     \note When using the constructor taking the \c QByteArray, please make sure to convert the
         containing data to big-endian byte order before creating the request.
 
-    The same response can be created like this, if the values are know at compile time:
+    The same response can be created like this, if the values are known at compile time:
     \code
         quint8 payloadInBytes = 2, outputHigh = 0xcd, outputLow = 0x01;
         QModbusResponse response(QModbusResponse::ReadCoils, payloadInBytes, outputHigh, outputLow);
@@ -673,7 +673,7 @@ QDataStream &operator>>(QDataStream &stream, QModbusRequest &pdu)
 
     \note Usage is limited \c quint8 and \c quint16 only. This is because
     \c QDataStream stream operators will not only append raw data, but also
-    e.g. size, count etc. for complex types.
+    e.g. size, count, etc. for complex types.
 */
 
 /*!
diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h
index 104c365..5e440b2 100644
--- a/src/serialbus/qmodbusrtuserialmaster_p.h
+++ b/src/serialbus/qmodbusrtuserialmaster_p.h
@@ -330,7 +330,7 @@ public:
             break;
 
         case Send:
-            // send timeout will always happen unless cancelled by very quick bytesWritten
+            // send timeout will always happen unless canceled by very quick bytesWritten
             if (m_current.reply.isNull()) {
                 scheduleNextRequest();
             } else if (m_current.bytesWritten < m_current.adu.size()) {
diff --git a/src/serialbus/qmodbusrtuserialslave_p.h b/src/serialbus/qmodbusrtuserialslave_p.h
index 70f28cd..5c78d82 100644
--- a/src/serialbus/qmodbusrtuserialslave_p.h
+++ b/src/serialbus/qmodbusrtuserialslave_p.h
@@ -347,7 +347,7 @@ public:
             m_serialPort->setStopBits(m_stopBits);
         }
 
-        // for calulcation details see
+        // for calculation details see
         // QModbusRtuSerialMasterPrivate::calculateInterFrameDelay()
         m_interFrameDelayMilliseconds = qMax(m_interFrameDelayMilliseconds,
                                              qCeil(3500. / (qreal(m_baudRate) / 11.)));