Merge branch 4.x

doc/py_tutorials/py_calib3d/py_depthmap/py_depthmap.markdown

@@ -63,7 +63,7 @@ There are some parameters when you get familiar with StereoBM, and you may need
 - uniqueness_ratio: Another post-filtering step. If the best matching disparity is not sufficiently better than every other disparity in the search range, the pixel is filtered out. You can try tweaking this if texture_threshold and the speckle filtering are still letting through spurious matches.
 - prefilter_size and prefilter_cap: The pre-filtering phase, which normalizes image brightness and enhances texture in preparation for block matching. Normally you should not need to adjust these.
 
-These parameters are set with dedicated setters and getters after the algoritm
+These parameters are set with dedicated setters and getters after the algorithm
 initialization, such as `setTextureThreshold`, `setSpeckleRange`, `setUniquenessRatio`,
 and more. See cv::StereoBM documentation for details.
 

doc/py_tutorials/py_imgproc/py_morphological_ops/py_morphological_ops.markdown

@@ -147,6 +147,14 @@ array([[0, 0, 1, 0, 0],
        [1, 1, 1, 1, 1],
        [0, 0, 1, 0, 0],
        [0, 0, 1, 0, 0]], dtype=uint8)
+
+# Diamond-shaped Kernel
+>>> cv.getStructuringElement(cv.MORPH_DIAMOND,(5,5))
+array([[0, 0, 1, 0, 0],
+       [0, 1, 1, 1, 0],
+       [1, 1, 1, 1, 1],
+       [0, 1, 1, 1, 0],
+       [0, 0, 1, 0, 0]], dtype=uint8)
 @endcode
 Additional Resources
 --------------------