Merge branch 'master' into merge-2.4

Conflicts:
	modules/photo/doc/inpainting.rst

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

diff --cc modules/gpuimgproc/doc/hough.rst
Simple merge

diff --cc modules/highgui/doc/user_interface.rst
Simple merge

diff --cc modules/imgproc/doc/filtering.rst
index d55ee1f,6d89e20..5803145
--- 1/modules/imgproc/doc/filtering.rst
--- 2/modules/imgproc/doc/filtering.rst
+++ b/modules/imgproc/doc/filtering.rst
@@@ -782,11 -782,16 +782,16 @@@ The function supports the in-place mode
      :ocv:func:`erode`,
      :ocv:func:`morphologyEx`,
      :ocv:func:`createMorphologyFilter`
+     :ocv:func:`getStructuringElement`
+ 
  
 -.. Sample code::
 +.. note::
  
 -   * : An example using the morphological dilate operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
 +   * 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 -828,12 +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::
 +.. note::
  
 -   * : An example using the morphological erode operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
 +   * An example using the morphological erode operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
  
  filter2D
  --------
@@@ -1157,11 -1191,12 +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::
 +.. note::
  
 -   * : An example using the morphologyEx function for the morphological opening and closing operations can be found at opencv_source_code/samples/cpp/morphology2.cpp
 +   * 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/imgproc/doc/miscellaneous_transformations.rst
index 16fcf53,1fc4d68..47de0b4
--- 1/modules/imgproc/doc/miscellaneous_transformations.rst
--- 2/modules/imgproc/doc/miscellaneous_transformations.rst
+++ b/modules/imgproc/doc/miscellaneous_transformations.rst
@@@ -799,10 -799,9 +799,9 @@@ See the sample ``grabcut.cpp`` to lear
  
  .. [Meyer92] Meyer, F. *Color Image Segmentation*, ICIP92, 1992
  
- .. [Telea04] Alexandru Telea, *An Image Inpainting Technique Based on the Fast Marching Method*. Journal of Graphics, GPU, and Game Tools 9 1, pp 23-34 (2004)
  
 -.. Sample code::
 +.. note::
  
 -   * : An example using the GrabCut algorithm can be found at opencv_source_code/samples/cpp/grabcut.cpp
 +   * An example using the GrabCut algorithm can be found at opencv_source_code/samples/cpp/grabcut.cpp
  
 -   * : PYTHON : An example using the GrabCut algorithm can be found at opencv_source_code/samples/python2/grabcut.py
 +   * (Python) An example using the GrabCut algorithm can be found at opencv_source_code/samples/python2/grabcut.py

diff --cc modules/photo/doc/inpainting.rst
index 58db4db,feb5edf..625f70a
--- 1/modules/photo/doc/inpainting.rst
--- 2/modules/photo/doc/inpainting.rst
+++ b/modules/photo/doc/inpainting.rst
@@@ -31,8 -31,14 +31,13 @@@ The function reconstructs the selected 
  http://en.wikipedia.org/wiki/Inpainting
  for more details.
  
 -.. Sample code::
 +.. note::
  
 -   * : An example using the inpainting technique can be found at opencv_source_code/samples/cpp/inpaint.cpp
 +   * 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
 +   * (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