docs changes

diff --cc modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
Simple merge

diff --cc modules/highgui/doc/user_interface.rst
index 3b822e4,b511c52..37cc790
--- 1/modules/highgui/doc/user_interface.rst
--- 2/modules/highgui/doc/user_interface.rst
+++ b/modules/highgui/doc/user_interface.rst
@@@ -79,8 -75,8 +79,11 @@@ The function ``imshow`` displays an ima
  
      * If the image is 32-bit floating-point, the pixel values are multiplied by 255. That is, the value range [0,1] is mapped to [0,255].
  
 -This function should be followed by ``waitKey`` function which displays the image for specified milliseconds. Otherwise, it won't display the image.
 +If window was created with OpenGL support, ``imshow`` also support :ocv:class:`ogl::Buffer` ,  :ocv:class:`ogl::Texture2D` and  :ocv:class:`gpu::GpuMat` as input.
 +
++.. note:: This function should be followed by ``waitKey`` function which displays the image for specified milliseconds. Otherwise, it won't display the image.
++
+ 
  namedWindow
  ---------------
  Creates a window.

diff --cc modules/imgproc/doc/filtering.rst
index e7382ec,635a3b1..6d89e20
--- 1/modules/imgproc/doc/filtering.rst
--- 2/modules/imgproc/doc/filtering.rst
+++ b/modules/imgproc/doc/filtering.rst
@@@ -782,11 -778,9 +782,16 @@@ The function supports the in-place mode
      :ocv:func:`erode`,
      :ocv:func:`morphologyEx`,
      :ocv:func:`createMorphologyFilter`
+     :ocv:func:`getStructuringElement`
++
 +
 +.. Sample code::
 +
 +   * : An example using the morphological dilate operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
 +
+     
+ 
++
  erode
  -----
  Erodes an image by using a specific structuring element.
@@@ -823,11 -817,10 +828,12 @@@ The function supports the in-place mode
  
      :ocv:func:`dilate`,
      :ocv:func:`morphologyEx`,
-     :ocv:func:`createMorphologyFilter`
+     :ocv:func:`createMorphologyFilter`,
+     :ocv:func:`getStructuringElement`
  
 +.. Sample code::
  
 +   * : An example using the morphological erode operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
  
  filter2D
  --------
@@@ -1157,11 -1178,9 +1191,12 @@@ Any of the operations can be done in-pl
  
      :ocv:func:`dilate`,
      :ocv:func:`erode`,
-     :ocv:func:`createMorphologyFilter`
+     :ocv:func:`createMorphologyFilter`,
+     :ocv:func:`getStructuringElement`
  
 +.. Sample code::
 +
 +   * : An example using the morphologyEx function for the morphological opening and closing operations can be found at opencv_source_code/samples/cpp/morphology2.cpp
  
  Laplacian
  ---------

diff --cc modules/photo/doc/inpainting.rst
index 149da03,9c46517..feb5edf
--- 1/modules/photo/doc/inpainting.rst
--- 2/modules/photo/doc/inpainting.rst
+++ b/modules/photo/doc/inpainting.rst
@@@ -31,8 -31,6 +31,14 @@@ The function reconstructs the selected 
  http://en.wikipedia.org/wiki/Inpainting
  for more details.
  
 +.. Sample code::
 +
 +   * : An example using the inpainting technique can be found at opencv_source_code/samples/cpp/inpaint.cpp
 +
 +   * : PYTHON : An example using the inpainting technique can be found at opencv_source_code/samples/python2/inpaint.py
++
++
+ .. [Telea04] Telea, Alexandru. "An image inpainting technique based on the fast marching method." Journal of graphics tools 9, no. 1 (2004): 23-34.
+ 
+ .. [Navier01] Bertalmio, Marcelo, Andrea L. Bertozzi, and Guillermo Sapiro. "Navier-stokes, fluid dynamics, and image and video inpainting." In Computer Vision and Pattern Recognition, 2001. CVPR 2001. Proceedings of the 2001 IEEE Computer Society Conference on, vol. 1, pp. I-355. IEEE, 2001.
++

diff --cc modules/video/doc/motion_analysis_and_object_tracking.rst
Simple merge