From d0e48dc2ad0e60ff0f49e72f3e196d6cdf679210 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Wed, 31 Jan 2018 17:37:04 +0100
Subject: [PATCH] DOC: update URL for git repository
---
Documentation/Cookbook/rst/FAQ.rst | 4 ++--
Documentation/Cookbook/rst/Installation_Linux_xdk.txt | 2 +-
Documentation/Cookbook/rst/Monteverdi.rst | 2 +-
Documentation/Cookbook/rst/recipes/optpreproc.rst | 2 +-
Documentation/Cookbook/rst/recipes/pbclassif.rst | 2 +-
Documentation/SoftwareGuide/Latex/Installation.tex | 2 +-
Documentation/SoftwareGuide/Latex/Introduction.tex | 6 +++---
Documentation/SoftwareGuide/Latex/Tutorial.tex | 2 +-
.../src/otbWrapperElevationParametersHandler.cxx | 6 +++++-
README.md | 10 +++++-----
10 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Documentation/Cookbook/rst/FAQ.rst b/Documentation/Cookbook/rst/FAQ.rst
index 490e77a34c..83faac13ab 100644
--- a/Documentation/Cookbook/rst/FAQ.rst
+++ b/Documentation/Cookbook/rst/FAQ.rst
@@ -189,7 +189,7 @@ The first time, you can get the source code using:
::
- git clone https://git@git.orfeo-toolbox.org/git/otb.git
+ git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git
Then you can build OTB as usual using this directory as the source
(refer to build instructions). Later if you want to update your source,
@@ -428,7 +428,7 @@ You can get the base doing:
::
- git clone https://git@git.orfeo-toolbox.org/git/otb-data.git
+ git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data.git
This is about 1Â GB of data, so it will take a while, but you have to do
it only once, as after, a simple
diff --git a/Documentation/Cookbook/rst/Installation_Linux_xdk.txt b/Documentation/Cookbook/rst/Installation_Linux_xdk.txt
index a81d7f1f6f..38c890f066 100644
--- a/Documentation/Cookbook/rst/Installation_Linux_xdk.txt
+++ b/Documentation/Cookbook/rst/Installation_Linux_xdk.txt
@@ -54,7 +54,7 @@ Download, Configure and build OTB
::
mkdir -p /opt/OTB/build && cd /opt/OTB
- git clone --depth=1 --branch=develop https://git@git.orfeo-toolbox.org/git/otb.git source
+ git clone --depth=1 --branch=develop https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git source
cd build && cmake ../source
make -j2
diff --git a/Documentation/Cookbook/rst/Monteverdi.rst b/Documentation/Cookbook/rst/Monteverdi.rst
index 257ae1a017..ac362cc282 100644
--- a/Documentation/Cookbook/rst/Monteverdi.rst
+++ b/Documentation/Cookbook/rst/Monteverdi.rst
@@ -321,7 +321,7 @@ Conclusion
~~~~~~~~~~
The images used in this documentation can be found in the OTB-Data
-repository (https://git.orfeo-toolbox.org/otb-data.git):
+repository (https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data.git):
- in OTB-Data/Input:
diff --git a/Documentation/Cookbook/rst/recipes/optpreproc.rst b/Documentation/Cookbook/rst/recipes/optpreproc.rst
index 41b1169fa8..e3f00ca3a4 100644
--- a/Documentation/Cookbook/rst/recipes/optpreproc.rst
+++ b/Documentation/Cookbook/rst/recipes/optpreproc.rst
@@ -242,7 +242,7 @@ path to a file which contains the geoid. `Geoid <http://en.wikipedia.org/wiki/Ge
corresponds to the equipotential surface that would coincide with the mean ocean surface of
the Earth.
-We provide one geoid in the `OTB-Data <https://git.orfeo-toolbox.org/otb-data.git/tree/HEAD:/Input/DEM>`_ repository.
+We provide one geoid in the `OTB-Data <https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/tree/master/Input/DEM>`_ repository.
In all applications, the option **elev.geoid** allows to manage the path
to the geoid. Finally, it is also possible to use an average elevation
diff --git a/Documentation/Cookbook/rst/recipes/pbclassif.rst b/Documentation/Cookbook/rst/recipes/pbclassif.rst
index 1e26e4c7f5..4202066085 100644
--- a/Documentation/Cookbook/rst/recipes/pbclassif.rst
+++ b/Documentation/Cookbook/rst/recipes/pbclassif.rst
@@ -525,7 +525,7 @@ Example
We consider 4 classes: water, roads, vegetation and buildings with red
roofs. Data is available in the OTB-Data
-`repository <https://git.orfeo-toolbox.org/otb-data.git/tree/HEAD:/Input/Classification>`_ .
+`repository <https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/tree/master/Input/Classification>`_ .
.. |image_21| image:: ../Art/MonteverdiImages/classification_chain_inputimage.jpg
.. |image_22| image:: ../Art/MonteverdiImages/classification_chain_fancyclassif_fusion.jpg
diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex
index ea869b7531..e6ab1534d2 100644
--- a/Documentation/SoftwareGuide/Latex/Installation.tex
+++ b/Documentation/SoftwareGuide/Latex/Installation.tex
@@ -163,7 +163,7 @@ To setup this structure, the following commands can be used:
\begin{verbatim}
$ mkdir ~/OTB
$ cd ~/OTB
-$ git clone https://git@git.orfeo-toolbox.org/git/otb.git
+$ git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git
$ mkdir build
$ mkdir install
\end{verbatim}
diff --git a/Documentation/SoftwareGuide/Latex/Introduction.tex b/Documentation/SoftwareGuide/Latex/Introduction.tex
index bca731112b..f3ae6653ba 100644
--- a/Documentation/SoftwareGuide/Latex/Introduction.tex
+++ b/Documentation/SoftwareGuide/Latex/Introduction.tex
@@ -100,14 +100,14 @@ process described in Section \ref{chapter:Installation}.
There are two other ways of getting the OTB source code:
\begin{itemize}
\item Clone the current release with \href{https://git-scm.com/}{Git} from the
- \href{https://git.orfeo-toolbox.org/otb.git}{OTB git server}, (master branch)
+ \href{https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git}{OTB git server}, (master branch)
\item Clone the latest revision with \href{https://git-scm.com/}{Git} from the
- \href{https://git.orfeo-toolbox.org/otb.git}{OTB git server} (develop branch).
+ \href{https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git}{OTB git server} (develop branch).
\end{itemize}
These last two options need a proper \href{https://git-scm.com/}{Git} installation. To get source code from Git, do:
\begin{verbatim}
-git clone https://git@git.orfeo-toolbox.org/git/otb.git
+git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb.git
\end{verbatim}
Using Git, you can easily navigate through the different versions. The master
diff --git a/Documentation/SoftwareGuide/Latex/Tutorial.tex b/Documentation/SoftwareGuide/Latex/Tutorial.tex
index be8cd232fc..4a09dc6602 100644
--- a/Documentation/SoftwareGuide/Latex/Tutorial.tex
+++ b/Documentation/SoftwareGuide/Latex/Tutorial.tex
@@ -224,7 +224,7 @@ Once this file is written you just have to run \code{make}. The
Get one image from the \code{OTB-Data/Examples} directory from the OTB-Data
repository. You can get it either by cloning the OTB data repository
-(\code{git clone https://git.orfeo-toolbox.org/otb-data.git}), but that might be quite
+(\code{git clone https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data.git}), but that might be quite
long as this also gets the data to run the tests. Alternatively, you can get it from
\url{http://www.orfeo-toolbox.org/packages/OTB-Data-Examples.tgz}.
Take for example get \code{QB\_Suburb.png}.
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
index f645553e03..726f1dbe3c 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
@@ -57,7 +57,11 @@ void ElevationParametersHandler::AddElevationParameters(Application::Pointer app
oss.str("");
oss << key<<".geoid";
app->AddParameter(ParameterType_InputFilename, oss.str(), "Geoid File");
- app->SetParameterDescription(oss.str(),"Use a geoid grid to get the height above the ellipsoid in case there is no DEM available, no coverage for some points or pixels with no_data in the DEM tiles. A version of the geoid can be found on the OTB website (https://git.orfeo-toolbox.org/otb-data.git/blob/HEAD:/Input/DEM/egm96.grd).");
+ app->SetParameterDescription(oss.str(),"Use a geoid grid to get the height "
+ "above the ellipsoid in case there is no DEM available, no coverage for "
+ "some points or pixels with no_data in the DEM tiles. A version of the "
+ "geoid can be found on the OTB website"
+ "(https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/blob/master/Input/DEM/egm96.grd).");
app->MandatoryOff(oss.str());
std::string geoidFromConfig = otb::ConfigurationManager::GetGeoidFile();
diff --git a/README.md b/README.md
index 7ae06474de..2842c132d8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#  Orfeo Toolbox
+#  Orfeo Toolbox
## Open Source processing of remote sensing images
Orfeo ToolBox (OTB) is an open-source project for state-of-the-art remote
@@ -23,12 +23,12 @@ not a black box!
* [OTB's website](https://www.orfeo-toolbox.org/)
* [Documentation](https://www.orfeo-toolbox.org/documentation/)
* [Downloads](https://www.orfeo-toolbox.org/download/)
-* [Public git repositories](https://git.orfeo-toolbox.org/)
+* [Public git repositories](https://gitlab.orfeo-toolbox.org/orfeotoolbox)
* [GitHub mirror](https://github.com/orfeotoolbox/)
* [Build status](http://dash.orfeo-toolbox.org/index.php?project=OTB)
-* [Bug tracker](https://bugs.orfeo-toolbox.org/)
+* [Bug tracker](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues?label_name%5B%5D=general)
* [Wiki](http://wiki.orfeo-toolbox.org/index.php/Main_Page)
-* [Task tracking](http://scrum.orfeo-toolbox.org)
+* [Task tracking](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues)
### Join the community
Get help, share your experience and contribute to the Orfeo-Toolbox project by
@@ -43,4 +43,4 @@ Please see the wiki for contributors guidelines.
Please see the license and the Copyright directory for legal issues on the use of the software.
### Issues
-Please report any issue you might encouter to [our bugtracker](http://bugs.orfeo-toolbox.org).
+Please report any issue you might encouter to [our bugtracker](https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues).
--
GitLab