From 1bd1bce9f5ba6e334d3bed4016482da14728960b Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Tue, 4 Oct 2016 16:03:13 +0200
Subject: [PATCH] DOC: update installation text on cookbook. reused in
 packaging

---
 Documentation/Cookbook/rst/Installation.rst   |  4 ---
 .../Cookbook/rst/Installation_FAQ.txt         | 31 -----------------
 .../Cookbook/rst/Installation_Linux.txt       | 34 +++++++++++++++++++
 3 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/Documentation/Cookbook/rst/Installation.rst b/Documentation/Cookbook/rst/Installation.rst
index 18aecfdaa1..32c5f09198 100644
--- a/Documentation/Cookbook/rst/Installation.rst
+++ b/Documentation/Cookbook/rst/Installation.rst
@@ -26,10 +26,6 @@ Linux 64bit
 
 .. include:: Installation_Linux.txt
 
-FAQ for Packaging
------------------
-
-.. include:: Installation_FAQ.txt
 
 MacOS X
 -------
diff --git a/Documentation/Cookbook/rst/Installation_FAQ.txt b/Documentation/Cookbook/rst/Installation_FAQ.txt
index e9b66c5581..e69de29bb2 100644
--- a/Documentation/Cookbook/rst/Installation_FAQ.txt
+++ b/Documentation/Cookbook/rst/Installation_FAQ.txt
@@ -1,31 +0,0 @@
-Q: I am getting an error message...
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-::
-
-   Cannot mix incompatible Qt library (version 0x40806) with this library (version 0x40807)
-   Aborted
-
-A: This is due to a conflict with system Qt4 (usually seen on KDE) and Qt4 + gtk libs in OTB package. The fix you need is to remove those libs from package.
-
-.. parsed-literal::
-
-   cd /path/to/OTB-|release|-Linux64
-   rm -f lib/libQt* && rm -fr lib/gtk
-
-Q: Monteverdi and Mapla applications look different from my other applications.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-A: By default, Monteverdi, Mapla and otbapplication (otbgui\_\*) uses a default gtk theme (plastic)
-which is distributed with the OTB package!.  We do this to be on safe side, like when a user does
-not have gtk libraries installed when using our package.
-
-gtk libraries in the package is  the reason why you are getting a default "plastic" look & feel that
-makes it look different from other GUI applications.
-To get same look and feel, you can "force"  Monteverdi and Mapla to use system GTK.
-
-::
-
-   export OTB_USE_SYSTEM_GTK=1
-
-And now start ``monteverdi.sh`` or ``mapla.sh`` from OTB-|release|-Linux64
-To get back default behaviour, unset OTB_USE_SYSTEM_GTK=1 or set OTB_USE_SYSTEM_GTK=0
diff --git a/Documentation/Cookbook/rst/Installation_Linux.txt b/Documentation/Cookbook/rst/Installation_Linux.txt
index a08e907f02..1c98c5a85d 100644
--- a/Documentation/Cookbook/rst/Installation_Linux.txt
+++ b/Documentation/Cookbook/rst/Installation_Linux.txt
@@ -60,3 +60,37 @@ Notes:
 
 - Multiple installation of OTB can exists in same system without one conflicting the other!
 
+FAQ for Packaging
+-----------------
+
+Q: I am getting an error message...
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+::
+
+   Cannot mix incompatible Qt library (version 0x40806) with this library (version 0x40807)
+   Aborted
+
+A: This is due to a conflict with system Qt4 (usually seen on KDE) and Qt4 + gtk libs in OTB package. The fix you need is to remove those libs from package.
+
+.. parsed-literal::
+
+   cd /path/to/OTB-|release|-Linux64
+   rm -f lib/libQt* && rm -fr lib/gtk
+
+Q: Monteverdi and Mapla applications look different from my other applications.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A: By default, Monteverdi, Mapla and otbapplication (otbgui\_\*) uses a default gtk theme (plastic)
+which is distributed with the OTB package!.  We do this to be on safe side, like when a user does
+not have gtk libraries installed when using our package.
+
+gtk libraries in the package is  the reason why you are getting a default "plastic" look & feel that
+makes it look different from other GUI applications.
+To get same look and feel, you can "force"  Monteverdi and Mapla to use system GTK.
+
+::
+
+   export OTB_USE_SYSTEM_GTK=1
+
+And now start ``monteverdi.sh`` or ``mapla.sh`` from OTB-|release|-Linux64
+To get back default behaviour, unset OTB_USE_SYSTEM_GTK=1 or set OTB_USE_SYSTEM_GTK=0
-- 
GitLab