merged all the latest changes from 2.4 to trunk

doc/tutorials/introduction/android_binary_package/android_binary_package.rst

@@ -100,7 +100,7 @@ You need the following tools to be installed:
 
    Check the `Android SDK System Requirements
    <http://developer.android.com/sdk/requirements.html>`_ document for a list of Eclipse versions that are compatible with the Android SDK. 
-   For OpenCV 2.3.1 we recommend Eclipse 3.7 (Indigo) or Eclipse 3.6 (Helios). They work well for OpenCV under both Windows and Linux.
+   For OpenCV 2.4.0 we recommend Eclipse 3.6 (Helios) or later versions. They work well for OpenCV under both Windows and Linux.
    
    If you have no Eclipse installed, you can download it from this location:
     
@@ -154,12 +154,12 @@ Get the OpenCV package for Android development
    
    .. code-block:: bash
 
-      tar -jxvf ~/Downloads/OpenCV-2.3.1-android-bin.tar.bz2
+      tar -jxvf ~/Downloads/OpenCV-2.4.0-android-bin.tar.bz2
       
    For this tutorial I have unpacked OpenCV to the :file:`C:\\Work\\android-opencv\\` directory.
 
-.. |opencv_android_bin_pack| replace:: OpenCV-2.3.1-android-bin.tar.bz2
-.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.3.1/OpenCV-2.3.1-android-bin.tar.bz2/download
+.. |opencv_android_bin_pack| replace:: OpenCV-2.4.0-android-bin.tar.bz2
+.. _opencv_android_bin_pack_url: http://sourceforge.net/projects/opencvlibrary/files/opencv-android/2.4.0/OpenCV-2.4.0-android-bin.tar.bz2/download
 .. |opencv_android_bin_pack_url| replace:: |opencv_android_bin_pack|
 .. |seven_zip| replace:: 7-Zip
 .. _seven_zip: http://www.7-zip.org/

doc/tutorials/introduction/linux_install/linux_install.rst

@@ -7,7 +7,7 @@ These steps have been tested for Ubuntu 10.04 but should work with other distros
 Required packages
 ==================
 
-  * GCC 4.x or later. This can be installed with
+  * GCC 4.4.x or later. This can be installed with
 
     .. code-block:: bash
 
@@ -15,13 +15,12 @@ Required packages
  
   * CMake 2.6 or higher
   * Subversion (SVN) client
-  * GTK+2.x or higher, including headers
+  * GTK+2.x or higher, including headers (libgtk2.0-dev)
   * pkgconfig
-  * libpng, zlib, libjpeg, libtiff, libjasper with development files (e.g. libpjeg-dev)
-  * Python 2.3 or later with developer packages (e.g. python-dev)
-  * SWIG 1.3.30 or later (only for versions prior to OpenCV 2.3)
-  * libavcodec
-  * libdc1394 2.x 
+  * Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy)
+  * ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev
+  * [optional] libdc1394 2.x 
+  * [optional] libjpeg-dev, libpng-dev, libtiff-dev, libjasper-dev.
 
 All the libraries above can be installed via Terminal or by using Synaptic Manager
 

doc/tutorials/introduction/windows_install/windows_install.rst

@@ -16,7 +16,7 @@ Installation by using the pre-built libraries
 
 1. Open up a web browser and go to: http://sourceforge.net/projects/opencvlibrary/files/opencv-win/
 
-#. Open the folder for the latest version (currently this is 2.3).
+#. Open the folder for the latest version (currently this is 2.4).
 
 #. Choose a build you want to use and download it. The naming conventions used will show what kind of support they offer. For example:
    
@@ -60,7 +60,7 @@ If you are building your own libraries you can take either the source files from
 
    .. container:: enumeratevisibleitemswithsquare
 
-      + stable and tested build - http://code.opencv.org/svn/opencv/branches/2.3 (the number at the end will change with every new realease, so change it to that)
+      + stable and tested build - http://code.opencv.org/svn/opencv/branches/2.4 (the number at the end will change with every new realease, so change it to that)
       + development build - http://code.opencv.org/svn/opencv/trunk/
 
 While the later one may contain a couple of new and experimental algorithms, performance increases and interface improvements, be aware, that it may also contain many-many bugs. Using the first one is recommended in most of the cases. That is unless you are extending the OpenCV library itself or really need to most up to date version of it. 
@@ -347,7 +347,7 @@ Set the OpenCV enviroment variable and add it to the systems path
 
 First we set an enviroment variable to make easier our work. This will hold the install directory of our OpenCV library that we use in our projects. Start up a command window and enter:
 
-.. code-block:: bash
+::
 
    setx -m OPENCV_DIR D:\OpenCV\Build\Install
 
@@ -355,7 +355,7 @@ Here the directory is where you have your OpenCV binaries (*installed* or *built
 
 If you built static libraries then you are done. Otherwise, you need to add the *bin* folders path to the systems path.This is cause you will use the OpenCV library in form of *\"Dynamic-link libraries\"* (also known as **DLL**). Inside these are stored all the algorithms and information the OpenCV library contains. The operating system will load them only on demand, during runtime. However, to do this he needs to know where they are. The systems **PATH** contains a list of folders where DLLs can be found. Add the OpenCV library path to this and the OS will know where to look if he ever needs the OpenCV binaries. Otherwise, you will need to copy the used DLLs right beside the applications executable file (*exe*) for the OS to find it, which is highly unpleasent if you work on many projects. To do this start up again the |PathEditor|_ and add the following new entry (right click in the application to bring up the menu):
 
-.. code-block:: bash
+::
 
    %OPENCV_DIR%\bin