Merge remote-tracking branch 'origin/5.9' into 5.11

Change-Id: Id40dab17b02800199f70072115d7473041f683d8

1 files changed, 6 insertions, 3 deletions

diff --git a/sources/shiboken2/doc/wordsofadvice.rst b/sources/shiboken2/doc/wordsofadvice.rst
index b66799338..9aebf1f03 100644
--- a/sources/shiboken2/doc/wordsofadvice.rst
+++ b/sources/shiboken2/doc/wordsofadvice.rst
@@ -75,7 +75,8 @@ C++ object. In summary: don't do it!
 Python old style classes and PySide
 ===================================
 
-Because of some architectural decisions and deprecated Python types. Since PySide 1.1 old style classes are not supported with multiple inheritance.
+Because of some architectural decisions and deprecated Python types.
+Since PySide 1.1 old style classes are not supported with multiple inheritance.
 
 Below you can check the examples:
 
@@ -92,7 +93,8 @@ Example with old style class:
             pass
 
 
-this example will raise a 'TypeError' due to the limitation on PySide, to fix this you will need use the new style class:
+this example will raise a 'TypeError' due to the limitation on PySide, to fix
+this you will need use the new style class:
 
 
     .. code-block:: python
@@ -106,4 +108,5 @@ this example will raise a 'TypeError' due to the limitation on PySide, to fix th
             pass
 
 
-All classes used for multiple inheritance with other PySide types need to have 'object' as base class.
+All classes used for multiple inheritance with other PySide types need to have
+'object' as base class.