From 2c82608e0e539e591a4b4c67656fc5dea1b7de78 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Mon, 26 Mar 2018 18:14:41 +0200
Subject: [PATCH] Merge branch
 '5805-contrib-doc-readme-ldap-migration-should-be-merged-to-readme-md' into
 '1.3-dev'

Resolve "contrib/doc/README.ldap-migration should be merged to README.md"

Closes #5805

See merge request fusiondirectory/fd!185

(cherry picked from commit 62351326846d27a45eeab11d7d5b7e04af03e493)

24cb02ec :books: fix(readme): contrib/doc/README.ldap-migration should be merged to README.md
---
 README.md                          | 19 ++++++++++++++++-
 contrib/docs/README.ldap-migration | 34 ------------------------------
 2 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 contrib/docs/README.ldap-migration

diff --git a/README.md b/README.md
index a02bb22f3..720b1c777 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,24 @@ This question can be solved by creating:
 
 ## Installation and upgrade of FusionDirectory
 
-The installation and upgrade information is available on [fusiondirectory-install]
+The installation and upgrade information is available on [Install FusionDirectory][fusiondirectory-install]
+
+## Migration to FusionDirectory
+
+To migrate an existing LDAP tree, you've to do all steps [Install FusionDirectory][fusiondirectory-install],
+plus some modifications:
+
+* FusionDirectory only shows users that have the objectClass inetOrgPerson
+
+* FusionDirectory only recognizes subtrees (or departments in FusionDirectory's view of things) that have the objectClass gosaDepartment.
+  You can hide subtrees from FusionDirectory by not putting this objectClass inside.
+
+The FusionDirectory setup may be used to do these migrations, but it is not meant
+to work in every possible circumstance. Please be carefull when using it on
+productive system.
+
+That should be all. Entries should be visible in FusionDirectory now.
+Be aware that if your naming policy of user cn's differs from the way FusionDirectory handles it, the entries get rewritten to a FusionDirectory style dn.
 
 ## Get help
 
diff --git a/contrib/docs/README.ldap-migration b/contrib/docs/README.ldap-migration
deleted file mode 100644
index 801177188..000000000
--- a/contrib/docs/README.ldap-migration
+++ /dev/null
@@ -1,34 +0,0 @@
-LDAP TREE MIGRATION
-===================
-
-To migrate an existing LDAP tree, you've to do all steps from above,
-plus some modifications:
-
-- FusionDirectory only shows users that have the objectClass inetOrgPerson
-
-- FusionDirectory only recognizes subtrees (or departments in FusionDirectory's
-  view of things) that have the objectClass gosaDepartment. You can hide subtrees
-  from FusionDirectory by not putting this objectClass inside.
-
-The FusionDirectory setup may be used to do these migrations, but it is not meant
-to work in every possible circumstance. Please be carefull when using it on
-productive system.
-
-That should be all. Entries should be visible in FusionDirectory now. Be aware that if
-your naming policy of user cn's differs from the way FusionDirectory handles it, the
-entries get rewritten to a FusionDirectory style dn.
-
-Have fun!
-
----
-* Further information
-
-To improve this piece of software, please report all kind of errors using the bug tracker
-on https://gitlab.fusiondirectory.org/
-
-Documentation: http://documentation.fusiondirectory.org/
-Mailinglist:   http://lists.fusiondirectory.org/
-Irc:           #fusiondirectory on freenode
-
----
-The FusionDirectory project <contact@fusiondirectory.org>
-- 
GitLab