From 035c25f0e9224cc29a5e6af7f7e6aa09fb16cecc Mon Sep 17 00:00:00 2001 From: Mortier Benoit <benoit.mortier@opensides.be> Date: Fri, 19 Feb 2016 17:24:09 +0100 Subject: [PATCH] Updating manpages for 1.0.10 Signed-off-by: Mortier Benoit <benoit.mortier@opensides.be> Conflicts: contrib/man/fusiondirectory-insert-schema.1 contrib/man/fusiondirectory-setup.1 contrib/man/fusiondirectory.conf.5 --- contrib/man/fusiondirectory-insert-schema.1 | 4 ++++ contrib/man/fusiondirectory-setup.1 | 3 +++ contrib/man/fusiondirectory.conf.5 | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1 index 39a7e4e9f..c87c3a76e 100644 --- a/contrib/man/fusiondirectory-insert-schema.1 +++ b/contrib/man/fusiondirectory-insert-schema.1 @@ -133,7 +133,11 @@ .\" ======================================================================== .\" .IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1" +<<<<<<< HEAD .TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation" +======= +.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation" +>>>>>>> 483246f... Updating manpages for 1.0.10 .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1 index 0baa518bd..5dce9b767 100644 --- a/contrib/man/fusiondirectory-setup.1 +++ b/contrib/man/fusiondirectory-setup.1 @@ -165,6 +165,9 @@ This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups o .IP "\-\-migrate\-users" 4 .IX Item "--migrate-users" This option add FusionDirectory attributes to the people branch. +.IP "\-\-migrate\-dns" 4 +.IX Item "--migrate-dns" +This option moves \s-1DNS\s0 zones from systems branch to \s-1DNS\s0 branch, which is necessary for FusionDirectory 1.0.10 and above. .IP "\-\-migrate\-acls" 4 .IX Item "--migrate-acls" This option will migrated old GOsa style acl from 1.0.7 into FusionDirectory acl roles in 1.0.8 diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5 index 315f5b646..48aff2593 100644 --- a/contrib/man/fusiondirectory.conf.5 +++ b/contrib/man/fusiondirectory.conf.5 @@ -133,7 +133,11 @@ .\" ======================================================================== .\" .IX Title "FUSIONDIRECTORY.CONF 1" +<<<<<<< HEAD .TH FUSIONDIRECTORY.CONF 1 "2016-06-23" "FusionDirectory 1.0.14" "FusionDirectory Documentation" +======= +.TH FUSIONDIRECTORY.CONF 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation" +>>>>>>> 483246f... Updating manpages for 1.0.10 .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l -- GitLab