merged 2.4 into trunk

doc/_themes/blue/static/default.css_t

@@ -30,7 +30,7 @@ div.documentwrapper {
 }
 
 div.bodywrapper {
-    margin: 0 0 0 230px;
+    margin: 0 0 0 270px;
 }
 
 div.body {
@@ -85,7 +85,7 @@ div.related a {
 
 div.sphinxsidebar {
     word-wrap: break-word;
-    width: 240px;
+    width: 270px;
     {%- if theme_stickysidebar|tobool %}
     top: 30px;
     margin: 0;

doc/tutorials/introduction/linux_install/linux_install.rst

@@ -72,7 +72,7 @@ Building OpenCV from source using CMake, using the command line
       cd ~/opencv
       mkdir release
       cd release
-      cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX= /usr/local
+      cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local ..
        
 #. Enter the created temporary directory (<cmake_binary_dir>) and proceed with:
 

doc/tutorials/introduction/windows_visual_studio_Opencv/windows_visual_studio_Opencv.rst

@@ -48,7 +48,7 @@ The really useful stuff of these is that you may create a rule package *once* an
    :alt: Add a new Property Sheet
    :align: center
 
-Use for example the *OpenCV_Debug* name. Then by selecting the sheet :menuselection:`Right Click --> Properties`. In the following I will show to set the OpenCV rules locally, as I find unnecessary to pollute projects with custom rules that I do not use it. Go the C++ groups General entry and under the *"Additional Include Directories"* add the path to your OpenCV include. 
+Use for example the *OpenCV_Debug* name. Then by selecting the sheet :menuselection:`Right Click --> Properties`. In the following I will show to set the OpenCV rules locally, as I find unnecessary to pollute projects with custom rules that I do not use it. Go the C++ groups General entry and under the *"Additional Include Directories"* add the path to your OpenCV include. If you don't have *"C/C++"* group, you should add any .c/.cpp file to the project.
 
 .. code-block:: bash
 
@@ -177,4 +177,4 @@ Here I first changed my drive (if your project isn't on the OS local drive), nav
    :alt: Visual Studio Command Line Arguments
    :align: center
 
-Specify here the name of the inputs and while you start your application from the Visual Studio enviroment you have automatic argument passing. In the next introductionary tutorial you'll see an in-depth explanation of the upper source code: :ref:`Display_Image`.
+Specify here the name of the inputs and while you start your application from the Visual Studio enviroment you have automatic argument passing. In the next introductionary tutorial you'll see an in-depth explanation of the upper source code: :ref:`Display_Image`.

doc/user_guide/ug_mat.rst

@@ -18,9 +18,15 @@ If you read a jpg file, a 3 channel image is created by default. If you need a g
 
     Mat img = imread(filename, 0);
 
+.. note:: format of the file is determined by its content (first few bytes)
+
 Save an image to a file: ::
 
-    Mat img = imwrite(filename);
+    imwrite(filename, img);
+    
+.. note:: format of the file is determined by its extension.
+
+.. note:: use ``imdecode`` and ``imencode`` to read and write image from/to memory rather than a file.
 
 XML/YAML
 --------