Merge remote-tracking branch 'origin/master'

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -142,7 +142,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`Android_Dev_Intro`
+  |AndroidLogo|    **Title:** :ref:`Android_Dev_Intro`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -156,7 +156,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`O4A_SDK`
+  |AndroidLogo|    **Title:** :ref:`O4A_SDK`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -170,7 +170,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`dev_with_OCV_on_Android`
+  |AndroidLogo|    **Title:** :ref:`dev_with_OCV_on_Android`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -180,9 +180,9 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   ================ =================================================
 
-     .. |AndroidNDKPack| image:: images/android_logo.png
+     .. |AndroidLogo| image:: images/android_logo.png
-                           :height: 90pt
+                        :height: 90pt
-                           :width:  90pt
+                        :width:  90pt
 
 
 * **iOS**
@@ -276,6 +276,7 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../android_binary_package/android_binary_package
    ../android_binary_package/android_binary_package_using_with_NDK
    ../android_binary_package/android_dev_intro
+   ../android_binary_package/O4A_SDK
    ../android_binary_package/dev_with_OCV_on_Android
    ../ios_install/ios_install
    ../display_image/display_image

modules/gpu/doc/video.rst

@@ -324,9 +324,9 @@ Class used for background/foreground segmentation. ::
         std::vector< std::vector<cv::Point> > foreground_regions;
     };
 
-The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_.
+  The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_.
 
-The results are available through the class fields:
+  The results are available through the class fields:
 
     .. ocv:member:: cv::gpu::GpuMat background
 
@@ -489,9 +489,9 @@ Gaussian Mixture-based Background/Foreground Segmentation Algorithm. ::
         ...
     };
 
-The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [MOG2004]_.
+  The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [MOG2004]_.
 
-Here are important members of the class that control the algorithm, which you can set after constructing the class instance:
+  Here are important members of the class that control the algorithm, which you can set after constructing the class instance:
 
     .. ocv:member:: float backgroundRatio
 

modules/ocl/doc/ocl.rst

@@ -1,19 +1,20 @@
-************************************
+***************************************
 ocl. OpenCL-accelerated Computer Vision
-************************************
+***************************************
 
 .. toctree::
     :maxdepth: 1
 
     introduction
-    initalization_and_information
+    structures_and_functions
-    data_structures
+..    initalization_and_information
-    operations_on_matrices
+..    data_structures
-    per_element_operations
+..    operations_on_matrices
-    image_processing
+..    per_element_operations
-    matrix_reductions
+..    image_processing
-    object_detection
+..    matrix_reductions
-    feature_detection_and_description
+..    object_detection
-    image_filtering
+..    feature_detection_and_description
-    camera_calibration_and_3d_reconstruction
+..    image_filtering
-    video
+..    camera_calibration_and_3d_reconstruction
+..    video