From 9629a196d3f6d73b217c797a66153e12f02c4c31 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Tue, 5 Mar 2019 08:48:17 +0000
Subject: [PATCH] Merge branch
 '5963-fix-reference-to-the-old-documentation-in-upgrade-md-and-readme-md'
 into '1.3-dev'

Resolve "fix reference to the old documentation in UPGRADE.md and README.md"

See merge request fusiondirectory/fd!549

(cherry picked from commit 245569a8cdee5ca8a6c1fa54b66e998362e8052a)

09c75042 :ambulance: fix(documentation) fix reference to the old documentation in UPGRADE.md and README.md
---
 README.md  | 2 +-
 UPGRADE.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 720b1c777..e3950c91c 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ If you like [FusionDirectory][FusionDirectory] and would like to [donate][donate
 
 [FusionDirectory]: https://www.fusiondirectory.org/
 
-[fusiondirectory-install]: http://documentation.fusiondirectory.org/en/documentation_admin
+[fusiondirectory-install]: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/install/index.html
 
 [get help]: https://www.fusiondirectory.org/contact-us/
 
diff --git a/UPGRADE.md b/UPGRADE.md
index 477312989..c82c2a659 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -3219,7 +3219,7 @@ fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/weblink-fd.sch
 
 [php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
 
-[repo-urls]: https://documentation.fusiondirectory.org/en/dl_install
+[repo-urls]: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/install/index.html
 
 ---
 * Further information
@@ -3227,7 +3227,7 @@ fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/weblink-fd.sch
 To improve this piece of software, please report all kind of errors using the bug tracker
 on https://gitlab.fusiondirectory.org
 
-Documentation: https://documentation.fusiondirectory.org/
+Documentation: https://fusiondirectory-user-manual.readthedocs.io/en/1.3/index.html
 Mailinglist:   https://lists.fusiondirectory.org/
 Irc:           #fusiondirectory on freenode
 
-- 
GitLab