diff --git a/contrib/bin/fusiondirectory-insert-schema b/contrib/bin/fusiondirectory-insert-schema
index 445fc9fc6582ae6ca3958ada8df6132b3731795d..4a8f7647e937b2e7a62452ad770bd77a94529656 100644
--- a/contrib/bin/fusiondirectory-insert-schema
+++ b/contrib/bin/fusiondirectory-insert-schema
@@ -1,25 +1,29 @@
#!/usr/bin/perl
-#######################################################################
+########################################################################
#
-# fusiondirectory-insert-schema -- insert schema needed into the ldap server
+# fusiondirectory-insert-schema
#
-# Copyright (C) 2011-2013 FusionDirectory project
+# Manipulate and insert the needed schema into the ldap server
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
+# This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+# Copyright (C) 2011-2015 FusionDirectory
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-#######################################################################
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+########################################################################
use strict;
use warnings;
@@ -320,7 +324,7 @@ This option make the program continue even if an error occur
=item -o
This option allow you to specify specifics options to give to ldap commands such as ldapmodify,
-but beware that you won’t be able to see things like password prompts as the output of these commands is piped.
+but beware that you will not be able to see things like password prompts as the output of these commands is piped.
=back
@@ -356,7 +360,7 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
=over 1
-=item Copyright (C) 2011-2014 FusionDirectory Project
+=item Copyright (C) 2011-2015 FusionDirectory Project
=back
diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 0a9fcb3487cd549e71e203a68ad8abfdce34aa8e..68fe3f40692e911a1c9fd8bcb58eb4bd9c07414f 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1,5 +1,30 @@
#!/usr/bin/perl
+########################################################################
+#
+# fusiondirectory-setup
+#
+# Manage fusiondirectory installs from the command line
+#
+# This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+# Copyright (C) 2011-2015 FusionDirectory
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+########################################################################
+
use strict;
use warnings;
use 5.008;
@@ -1594,7 +1619,7 @@ This code is part of FusionDirectory (http://www.fusiondirectory.org/)
=over 2
-=item Copyright (C) 2011-2014 FusionDirectory
+=item Copyright (C) 2011-2015 FusionDirectory
=back
diff --git a/contrib/man/fusiondirectory-insert-schema.1 b/contrib/man/fusiondirectory-insert-schema.1
index c238d2c64899d4b3907a7fdd89d7b3766dcb7527..c70688b7598d53bd7fdb426c2c5bde2f0855c0aa 100644
--- a/contrib/man/fusiondirectory-insert-schema.1
+++ b/contrib/man/fusiondirectory-insert-schema.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -38,6 +38,8 @@
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -124,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
-.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2014-11-01" "FusionDirectory 1.0.8.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2015-06-12" "FusionDirectory 1.0.8.8" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -157,7 +166,7 @@ This option make the program continue even if an error occur
.IP "\-o" 6
.IX Item "-o"
This option allow you to specify specifics options to give to ldap commands such as ldapmodify,
-but beware that you wona\*^XXt be able to see things like password prompts as the output of these commands is piped.
+but beware that you will not be able to see things like password prompts as the output of these commands is piped.
.SH "EXAMPLES"
.IX Header "EXAMPLES"
.Vb 2
@@ -186,10 +195,10 @@ Come Bernigaud
.SH "LICENCE AND COPYRIGHT"
.IX Header "LICENCE AND COPYRIGHT"
This code is part of FusionDirectory <http://www.fusiondirectory.org>
-.IP "Copyright (C) 2011\-2014 FusionDirectory Project" 1
-.IX Item "Copyright (C) 2011-2014 FusionDirectory Project"
+.IP "Copyright (C) 2011\-2015 FusionDirectory Project" 1
+.IX Item "Copyright (C) 2011-2015 FusionDirectory Project"
.PP
This program is distributed in the hope that it will be useful,
-but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the
+but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
\&\s-1GNU\s0 General Public License for more details.
diff --git a/contrib/man/fusiondirectory-setup.1 b/contrib/man/fusiondirectory-setup.1
index 49f4d0ba684cc6c188ef7d1477c3071a31e0046f..e4dad1eddeb4f65c262b952199ab7db11f5fa0a0 100644
--- a/contrib/man/fusiondirectory-setup.1
+++ b/contrib/man/fusiondirectory-setup.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -38,6 +38,8 @@
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -124,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
-.TH FUSIONDIRECTORY-SETUP 1 "2014-11-01" "FusionDirectory 1.0.8.3" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY-SETUP 1 "2015-06-11" "FusionDirectory 1.0.8.8" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -217,10 +226,10 @@ Come Bernigaud
.SH "LICENCE AND COPYRIGHT"
.IX Header "LICENCE AND COPYRIGHT"
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-.IP "Copyright (C) 2011\-2014 FusionDirectory" 2
-.IX Item "Copyright (C) 2011-2014 FusionDirectory"
+.IP "Copyright (C) 2011\-2015 FusionDirectory" 2
+.IX Item "Copyright (C) 2011-2015 FusionDirectory"
.PP
This program is distributed in the hope that it will be useful,
-but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the
+but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the
\&\s-1GNU\s0 General Public License for more details.
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index 859ef6cf8d48c5370f4dc659dd6a53dea1c755e6..751370d660c732f465252418e9138f27be7ba1ba 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.14)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -38,6 +38,8 @@
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
@@ -48,17 +50,24 @@
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -124,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
-.TH FUSIONDIRECTORY.CONF 1 "2013-09-23" "FusionDirectory 1.0" "FusionDirectory Documentation"
+.TH FUSIONDIRECTORY.CONF 1 "2015-06-11" "FusionDirectory 1.0.8.8" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -196,7 +205,7 @@ The templateCompileDirectory statements defines the path, where the \s-1PHP\s0 t
This path needs to be writeable by the user your webserver is running with.
.IP "\fBignoreAcl\fR \fIdn\fR" 4
.IX Item "ignoreAcl dn"
-The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN\s0. Add your \s-1DN\s0 here and you'll be able to restore accidently dropped ACLs.
+The ignoreAcl value tells FusionDirectory to ignore complete \s-1ACL\s0 sets for the given \s-1DN.\s0 Add your \s-1DN\s0 here and you'll be able to restore accidently dropped ACLs.
.IP "\fBdisplayerrors\fR bool" 4
.IX Item "displayerrors bool"
The displayerrors statement tells FusionDirectory to show \s-1PHP\s0 errors in the upper part of the screen. This should be disabled in productive deployments, because there
@@ -213,25 +222,25 @@ The config statement defines the \s-1LDAP\s0 base, where FusionDirectory stores
.IX Item "debuglevel integer"
The debuglevel value tells FusionDirectory to display certain information on each page load. Value is an \s-1OR\s0 combination of the following byte values :
.Sp
-\&\s-1DEBUG_TRACE\s0 = 1
+\&\s-1DEBUG_TRACE \s0 = 1
.Sp
-\&\s-1DEBUG_LDAP\s0 = 2
+\&\s-1DEBUG_LDAP \s0 = 2
.Sp
-\&\s-1DEBUG_DB\s0 = 4
+\&\s-1DEBUG_DB \s0 = 4
.Sp
-\&\s-1DEBUG_SHELL\s0 = 8
+\&\s-1DEBUG_SHELL \s0 = 8
.Sp
-\&\s-1DEBUG_POST\s0 = 16
+\&\s-1DEBUG_POST \s0 = 16
.Sp
-\&\s-1DEBUG_SESSION\s0 = 32
+\&\s-1DEBUG_SESSION \s0 = 32
.Sp
-\&\s-1DEBUG_CONFIG\s0 = 64
+\&\s-1DEBUG_CONFIG \s0 = 64
.Sp
-\&\s-1DEBUG_ACL\s0 = 128
+\&\s-1DEBUG_ACL \s0 = 128
.Sp
\&\s-1DEBUG_ARGONAUT\s0 = 256
.Sp
-\&\s-1DEBUG_MAIL\s0 = 512
+\&\s-1DEBUG_MAIL \s0 = 512
.SS "\s-1LDAP\s0 options"
.IX Subsection "LDAP options"
.IP "\fBldapTLS\fR \fIbool\fR" 4
@@ -252,7 +261,7 @@ Example:
\& password="secret" />
.Ve
.PP
-uri is a valid \s-1LDAP\s0 uri extendet by the base this referral is responsible for. admin is the \s-1DN\s0 which has the permission to write \s-1LDAP\s0 entries. And password is the corresponding password for this \s-1DN\s0.
+uri is a valid \s-1LDAP\s0 uri extendet by the base this referral is responsible for. admin is the \s-1DN\s0 which has the permission to write \s-1LDAP\s0 entries. And password is the corresponding password for this \s-1DN.\s0
You can define a set of referrals if you have several server to connect to.
.SH "BUGS"
.IX Header "BUGS"
@@ -263,8 +272,8 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
.IP "Copyright (C) 2003\-2010 \s-1GONICUS\s0 GmbH" 2
.IX Item "Copyright (C) 2003-2010 GONICUS GmbH"
.PD 0
-.IP "Copyright (C) 2011\-2013 FusionDirectory project" 2
-.IX Item "Copyright (C) 2011-2013 FusionDirectory project"
+.IP "Copyright (C) 2011\-2015 FusionDirectory project" 2
+.IX Item "Copyright (C) 2011-2015 FusionDirectory project"
.PD
.PP
-This program is distributed in the hope that it will be useful, but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of \s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0. See the \s-1GNU\s0 General Public License for more details.
+This program is distributed in the hope that it will be useful, but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE. \s0 See the \s-1GNU\s0 General Public License for more details.
diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod
index 0c80a57bb799a49e175f1dbfedbea1aea302bfd8..05fcb18b40f002b615ec7bee323cc29aea7ad227 100644
--- a/contrib/man/fusiondirectory.conf.pod
+++ b/contrib/man/fusiondirectory.conf.pod
@@ -157,7 +157,7 @@ This code is part of FusionDirectory <http://www.fusiondirectory.org>
=item Copyright (C) 2003-2010 GONICUS GmbH
-=item Copyright (C) 2011-2014 FusionDirectory project
+=item Copyright (C) 2011-2015 FusionDirectory project
=back