diff --git a/Documentation/Cookbook/rst/FAQ.rst b/Documentation/Cookbook/rst/FAQ.rst
index 39a2287c3ad8a033cea4a7bfa46f9b4d7c8fd36f..490e77a34c1619fb5025e823fcf680d9c3d27c83 100644
--- a/Documentation/Cookbook/rst/FAQ.rst
+++ b/Documentation/Cookbook/rst/FAQ.rst
@@ -243,22 +243,21 @@ OFF the CMake variable OTB\_USE\_EXTERNAL\_ITK.
OTB compilation and Windows platform
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-To build OTB on Windows, we highly recommend using OSGeo4W which
-provides all the necessary dependencies.
-
-Currently it is not possible to build OTB in Debug when using the
-dependencies provided by OSGeo4W. If you want to build OTB in Debug for
-Windows, you will need to build and install manually each dependency
-needed by OTB. You should use the same compiler for all the
-dependencies, as much as possible.
-
-Therefore, we highly recommend you to use OSGeo4W shell environment to
-build OTB. You can use the 32 or 64 bit installer, since OSGeo4W
-provides all the necessary dependencies in the two cases. Please follow
-carefully the procedure provided in the Software Guide.
-
-Typically, when using the dependencies provided by OSGeo4W, compile OTB
-in Release or RelWithDebInfo mode.
+To build OTB on Windows, you should prepare an environment with the following
+tools:
+
+* Visual Studio 2015 or later
+* CMake 3.1 or later
+* OTB XDK : download a Windows binary package of OTB and use the supplied
+ uninstall script to remove OTB binaries and headers. Now, this package only
+ contains the dependencies needed to build OTB.
+
+Then, you can download OTB sources (preferably, a version compatible with your
+XDK), and compile them as a standard CMake project. More details are available
+in the SoftwareGuide.
+
+There is an other solution, using OSGeo4W distribution. However, the
+dependencies may be outdated.
Using OTB
---------
diff --git a/Documentation/Cookbook/rst/Installation_Macx.txt b/Documentation/Cookbook/rst/Installation_Macx.txt
index 961e6b1b75e4d888fd77dfa9ad2063d1d26edbc1..f77d878dbdc93c71d35f55ffaf211391d613260e 100644
--- a/Documentation/Cookbook/rst/Installation_Macx.txt
+++ b/Documentation/Cookbook/rst/Installation_Macx.txt
@@ -90,6 +90,7 @@ A: You can get this error at startup running Monteverdi.app or Mapla.app. The
solution is to run in a terminal the following command:
::
+
xcode-select --install
And then try to restart Monteverdi or Mapla.
diff --git a/Documentation/SoftwareGuide/Latex/ContributorList.tex b/Documentation/SoftwareGuide/Latex/ContributorList.tex
index 8f34a6e134c565737bfa4edc4313219968fb53b2..9d86775fcd545dbd4a687275818dd56ecd69d3e5 100644
--- a/Documentation/SoftwareGuide/Latex/ContributorList.tex
+++ b/Documentation/SoftwareGuide/Latex/ContributorList.tex
@@ -5,6 +5,7 @@ Alexis Huck (Magellium),
Amit Kulkarni,
Andreas Tile (Debian GIS),
Angelos Tzotsos,
+Antoine Regimbeau (CS),
Antonio Valentino,
Aur\'elien Bricier (CS),
Caroline Ruffel (CS),
diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex
index 6c1531dc647cd109b5ebb1a094f7f078d06eb9b7..ea869b753148edff4d213bf066a1de0b26a24271 100644
--- a/Documentation/SoftwareGuide/Latex/Installation.tex
+++ b/Documentation/SoftwareGuide/Latex/Installation.tex
@@ -324,7 +324,7 @@ directory, which in our case is \texttt{~/OTB/install/bin/}. For example:
will launch the command line version of the \textbf{ExtractROI} application,
while:
\begin{verbatim}
-./OTB/install/bin/otbgui_ExtractROI
+~/OTB/install/bin/otbgui_ExtractROI
\end{verbatim}
will launch the graphical version.
@@ -420,7 +420,7 @@ $ make install
\hline
\textbf{OTB\_USE\_CURL} & OTBCurl & \\
\hline
-\textbf{OTB\_USE\_MUPARSER} & OTBMuParser & OTBMathParser OTBDempsterShafer OTBAppClassification OTBAppMathParser OTBAppStereo OTBAppProjection OTBAppSegmentation OTBAppClassification OTBRoadExtraction OTBRCC8 OTBCCOBIA OTBAppSegmentation OTBMeanShift OTBAppSegmentation OTBMeanShift OTBAppSegmentation \\
+\textbf{OTB\_USE\_MUPARSER} & OTBMuParser & OTBMathParser OTBDempsterShafer OTBAppClassification OTBAppMathParser OTBAppStereo OTBAppProjection OTBAppSegmentation OTBRoadExtraction OTBRCC8 OTBCCOBIA OTBMeanShift \\
\hline
\textbf{OTB\_USE\_MUPARSERX} & OTBMuParserX & OTBMathParserX OTBAppMathParserX \\
\hline
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 438e6ae1bb8b6ed12c01920fa2a150cd52e9dac4..2421280562e417e92d9a4f12d71cc33729a25736 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,3 +1,44 @@
+OTB-v.6.4.0 - Changes since version 6.2.0 (January 17th, 2018)
+----------------------------------------------------------
+
+* Request for Changes (http://wiki.orfeo-toolbox.org/index.php/Requests_for_Changes):
+ * Request for changes-104: Refactor OTB-applications input/output string/filename lists (adopted, merged)
+ * Request for changes-110: Histogram Equalization (adopted, merged)
+ * Request for changes-117: Merge Convert and Rescale applications (adopted, merged)
+ * Request for changes-118: Enable use of ossimSarSensorModel through geom file (adopted, merged)
+ * Request for changes-119: Install ossimPlugins headers related to ossimSarSensorModel (adopted, merged)
+ * Request for changes-120: Replacing itk::TimeProbe (adopted, merged)
+ * Request for changes-121: Add Laurențiu Nicola as a new committer (adopted, merged)
+ * Request for changes-122: Positive spacing enforcement (adopted, merged)
+ * Request for changes-123: Improve OTB Applications documentation (part 2) (adopted, merged)
+ * Request for changes-124: Add GSL to Superbuild (adopted,merged)
+ * Request for changes-126: Support python 2.7 and 3 wrappings (adopted, merged)
+
+* Bugfixes:
+ * Orfeo Toolbox (OTB)
+ * 0001501: Does Java wrapping works on Windows?
+ * 0001495: Crash when setting Orthorectification input field
+ * 0001489: BandMath and BandMathX are missing important documentation on expression syntax
+ * 0001479: Monteverdi try to create overviews with /vsicurl file
+ * 0001502: OTB configuration step does not properly check for c++14 availability
+ * 0001497: Some optional parameters are ON by default in otbgui
+ * 0001483: Monteverdi shows a pop up terminal on windows
+ * 0001496: Monteverdi 'build overviews' pop-up trigger condition is unclear or incorrect
+ * 0001494: Segmentation app shows 'Select parameters' instead of 'Running'
+ * 0001504: OTB does not compile with ITK last stable release 4.13
+ * 0001492: Monteverdi 6.2 is missing some French translations
+ * 0001503: Fix new coverity issues in release 6.4
+ * 0001499: OSSIMAdapters fails to build with OSSIM 2.2.0 (error: 'class ossimRpcSolver' has no member named 'createRpcProjection')
+ * 0001498: ExtractROI Channel list empty when application is chained in memory
+ * 0001476: Python wrapping not working with Python >= 3.4
+
+ * Documentation
+ * 0001500: Application example in OTB software guide is confusing
+
+ * OTB-applications
+ * 0001481: KMeansClassification application should be compiled only if OTB_USE_SHARK=ON
+
+
OTB-v.6.2.0 - Changes since version 6.0.0 (October 26th, 2017)
----------------------------------------------------------