13 commits - Installation_Guide/default configuration files Installation_Guide/en-US

Christian Mollekopf mollekopf at kolabsys.com
Tue Jul 26 18:21:16 CEST 2011


 Installation_Guide/default                                        |    8 
 Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml |  298 --
 Installation_Guide/en-US/Cyrus_IMAP.xml                           |    2 
 Installation_Guide/en-US/Installation_Guide.xml                   |    1 
 Installation_Guide/en-US/Installation_Introduction.xml            |   12 
 Installation_Guide/en-US/Kolab_Initial_Configuration.xml          |   66 
 Installation_Guide/en-US/Kolab_Server_Appendix.xml                |   40 
 Installation_Guide/en-US/Kolab_Server_Bootstrapping.xml           |  425 ++
 Installation_Guide/en-US/Kolab_Server_Configuration.xml           |  606 ++++
 Installation_Guide/en-US/Kolab_Server_Installation.xml            | 1449 +++-------
 Installation_Guide/en-US/Kolab_Server_Overview.xml                |  256 +
 Installation_Guide/en-US/Kolab_Webclient_Installation.xml         |  180 -
 Installation_Guide/en-US/Kontact.xml                              |   39 
 Installation_Guide/en-US/part-Kolab_Server.xml                    |   10 
 14 files changed, 1873 insertions(+), 1519 deletions(-)

New commits:
commit e3a30e8b5ee841742dd321b2178fea824301c0ba
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Thu Jul 21 16:24:25 2011 +0200

    appendix for additional infos (i.e. how to generate ca certificates)

diff --git a/Installation_Guide/en-US/Cyrus_IMAP.xml b/Installation_Guide/en-US/Cyrus_IMAP.xml
index 0335ed3..b043208 100755
--- a/Installation_Guide/en-US/Cyrus_IMAP.xml
+++ b/Installation_Guide/en-US/Cyrus_IMAP.xml
@@ -17,7 +17,7 @@
         <formalpara id="form-Installation_Guide-Installation_of_Cyrus_IMAP-Kolab_Systems_Repository_Configuration">
             <title>Kolab Systems Repository Configuration</title>
             <para>
-                Make sure you have the Kolab Systems software repositories configured properly on the system, before executing any of the following commands. For more information on configuring the Kolab Systems software repositories, please refer to TODO Repository Configuration<!--  xref linkend="sect-Installation_Guide-Obtaining_Kolab_Software-Repository_Configuration" /  -->.
+                Make sure you have the Kolab Systems software repositories configured properly on the system, before executing any of the following commands. For more information on configuring the Kolab Systems software repositories, please refer to <xref linkend="sect-Installation_Guide-Installation-Repository_Configuration" />.
             </para>
 
         </formalpara>
diff --git a/Installation_Guide/en-US/Kolab_Server_Appendix.xml b/Installation_Guide/en-US/Kolab_Server_Appendix.xml
new file mode 100755
index 0000000..ad579b6
--- /dev/null
+++ b/Installation_Guide/en-US/Kolab_Server_Appendix.xml
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter>
+    <title>Appendix</title>
+<section>
+<title>Certificate Authority (CA)-Certificates</title>
+<para>
+Kolab stores the CA-Certificates under the following locations:
+</para>
+<para>
+	Certificate: <filename>/etc/pki/tls/certs/host.example.org.cert</filename>
+</para>
+<para>
+	Private Key: <filename>/etc/pki/tls/private/host.example.org.key</filename>
+</para>
+<para>
+	Certificate Authority (CA) certificates: <filename>/etc/pki/tls/certs/host.example.org_ca.crt</filename>
+</para>
+<para>
+	The key are all in the pem format.
+</para>
+<para>
+	If you already have certificates for the Kolab server, you can copy them to the above locations.
+</para>
+<para>
+	If you don't have certificates, you can generate them using:
+</para>
+<para>
+	Todo: 
+	-use pykolab to generate the certificates?
+	-install package with the /usr/share/kolab/scripts/kolab_ca.sh scripts
+	-generate and install cert
+</para>
+</section>
+
+</chapter>
+
diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index af34226..af71437 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -177,14 +177,6 @@
 <screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
                 <para>
                     File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
-                    <note>
-                        <title>TLS Certifiactes</title>
-                        <para>
-                            TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
-                        </para>
-
-                    </note>
-
                 </para>
 
 <screen>tls_key_file:    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
@@ -196,6 +188,13 @@
                 <para>
                     File containing one or more Certificate Authority (CA) certificates.
                 </para>
+                <note>
+                    <title>TLS Certificates</title>
+                    <para>
+                        TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                    </para>
+
+                </note>
 
             </blockquote>
             <para>
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 2aeee93..c1dc1e4 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -6,7 +6,7 @@
 <chapter id="chap-Installation_Guide-Installation">
     <title>Installation</title>
     <para>
-        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages" /> for more information.
+        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Repository_Configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_Configuration-Installation_with_RPM_Packages" /> for more information.
     </para>
     <section id="sect-Installation_Guide-Installation-Kolab_Server_Installation">
         <title>Kolab Server Installation</title>
@@ -17,7 +17,10 @@
             The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
         </para>
         <para>
-            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages" /> for more information.
+            The default installation assumes that all components are installed on the same machine.
+        </para>
+        <para>
+            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Repository_Configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_Configuration-Installation_with_RPM_Packages" /> for more information.
         </para>
         <para>
             For help with your deployment please refer to the “Deployment Guide”.
@@ -25,12 +28,12 @@
 
     </section>
 
-    <section id="sect-Installation_Guide-Installation-Repository_configuration">
+    <section id="sect-Installation_Guide-Installation-Repository_Configuration">
         <title>Repository Configuration</title>
         <para>
             Kolab provides packages in extra repositories, therefore these repositories need to be configured first.
         </para>
-        <section id="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages">
+        <section id="sect-Installation_Guide-Repository_Configuration-Installation_with_APT_Packages">
             <title>Installation with APT Packages</title>
             <para>
                 APT packages are being provided for the following Linux distributions and versions:
@@ -38,7 +41,7 @@
 
         </section>
 
-        <section id="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages">
+        <section id="sect-Installation_Guide-Repository_Configuration-Installation_with_RPM_Packages">
             <title>Installation with RPM Packages</title>
             <para>
                 RPM packages are being provided for the following Linux distributions and versions:
diff --git a/Installation_Guide/en-US/Kolab_Server_Overview.xml b/Installation_Guide/en-US/Kolab_Server_Overview.xml
index 2c7b385..739a049 100755
--- a/Installation_Guide/en-US/Kolab_Server_Overview.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Overview.xml
@@ -16,7 +16,7 @@
             <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
                 <title>Kolab-IMAP</title>
                 <para>
-                    The IMAP server component including a deamon which handles the ldap authentication (kolabd).
+                    The IMAP server component including a daemon which synchronizes user accounts from LDAP with IMAP mailboxes.
                 </para>
 
             </formalpara>
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
index ef8cfaa..5d43a86 100755
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -10,5 +10,6 @@
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Bootstrapping.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Kolab_Server_Appendix.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </part>
 


commit 7e613cd473d01a12913ed246dc77c03ae6a07fe7
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Thu Jul 21 10:11:57 2011 +0200

    include "preparing the system", various small changes

diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index c88df8d..af34226 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -205,7 +205,7 @@
                     </para>
                     <listitem>
                         <para>
-			    <xref linkend="part-Installation_Guide-Cyrus_IMAP" />
+                            <xref linkend="part-Installation_Guide-Cyrus_IMAP" />
                         </para>
 
                     </listitem>
@@ -239,7 +239,7 @@
                         </para>
                         <listitem>
                             <para>
-                                Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                                Dovecot-IMAP <!--        xref linkend="sect-Installation_Guide-Dovecot-IMAP" /        -->
                             </para>
 
                         </listitem>
@@ -257,8 +257,8 @@
             <para>
                 <filename>/etc/postfix/main.cf</filename>
             </para>
-	    <para>
-		The Postfix main.cf configuration file specifies a very small subset of all the parameters that control the operation of the Postfix mail system. Parameters not explicitly specified are left at their default values.
+            <para>
+                The Postfix main.cf configuration file specifies a very small subset of all the parameters that control the operation of the Postfix mail system. Parameters not explicitly specified are left at their default values.
             </para>
             <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
                 <title>tls-cert</title>
@@ -310,15 +310,15 @@
                 <filename>/etc/postfix/master.cf</filename>
             </para>
             <para>
-		The  master.cf configuration file defines how a client program connects to a service, and what daemon program runs when a service is requested.
-                TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
+                The master.cf configuration file defines how a client program connects to a service, and what daemon program runs when a service is requested. TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
             </para>
-	    <note>
-		    <title>Manpage</title>
-		    <para>
-			    <userinput>man 5 master</userinput>
-		    </para>
-	    </note>
+            <note>
+                <title>Manpage</title>
+                <para>
+                    <userinput>man 5 master</userinput>
+                </para>
+
+            </note>
             <para>
                 <filename>/etc/postfix/ldap/mydestination.cf</filename>
             </para>
@@ -334,10 +334,10 @@
             <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
             </para>
-	    <para>
+            <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
             </para>
-	    <para>
+            <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
             </para>
             <para>
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 15c269b..2aeee93 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -6,7 +6,7 @@
 <chapter id="chap-Installation_Guide-Installation">
     <title>Installation</title>
     <para>
-        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Installation-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Installation-Installation_with_RPM_Packages" /> for more information.
+        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages" /> for more information.
     </para>
     <section id="sect-Installation_Guide-Installation-Kolab_Server_Installation">
         <title>Kolab Server Installation</title>
@@ -17,7 +17,7 @@
             The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
         </para>
         <para>
-            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Installation-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Installation-Installation_with_RPM_Packages" /> for more information.
+            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages" /> for more information.
         </para>
         <para>
             For help with your deployment please refer to the “Deployment Guide”.
@@ -25,56 +25,61 @@
 
     </section>
 
-    <section id="sect-Installation_Guide-Installation-Installation_with_APT_Packages">
-        <title>Installation with APT Packages</title>
+    <section id="sect-Installation_Guide-Installation-Repository_configuration">
+        <title>Repository Configuration</title>
         <para>
-            APT packages are being provided for the following Linux distributions and versions:
+            Kolab provides packages in extra repositories, therefore these repositories need to be configured first.
         </para>
+        <section id="sect-Installation_Guide-Repository_configuration-Installation_with_APT_Packages">
+            <title>Installation with APT Packages</title>
+            <para>
+                APT packages are being provided for the following Linux distributions and versions:
+            </para>
 
-    </section>
-
-    <section id="sect-Installation_Guide-Installation-Installation_with_RPM_Packages">
-        <title>Installation with RPM Packages</title>
-        <para>
-            RPM packages are being provided for the following Linux distributions and versions:
-        </para>
-        <para>
-            <table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
-                <title>RPM Packages Distribution Support</title>
-                <tgroup align="left" cols="5" colsep="1" rowsep="1">
-                    <colspec colname="c1"></colspec>
-                    <colspec colname="c2"></colspec>
-                    <colspec colname="c3"></colspec>
-                    <colspec colname="c4"></colspec>
-                    <colspec colname="c5" colnum="5"></colspec>
-                    <thead>
-                        <row>
-                            <entry align="center" nameend="c4" namest="c1">
-                                Distribution Information
-                            </entry>
-                            <entry morerows="1">
-                                EOS / EOL Date
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Name
-                            </entry>
-                            <entry>
-                                CodeName
-                            </entry>
-                            <entry>
-                                Version
-                            </entry>
-                            <entry>
-                                Architectures
-                            </entry>
-
-                        </row>
+        </section>
 
-                    </thead>
-                    <!--
+        <section id="sect-Installation_Guide-Repository_configuration-Installation_with_RPM_Packages">
+            <title>Installation with RPM Packages</title>
+            <para>
+                RPM packages are being provided for the following Linux distributions and versions:
+            </para>
+            <para>
+                <table frame="all" id="tabl-Installation_Guide-Installation_with_RPM_Packages-RPM_Packages_Distribution_Support">
+                    <title>RPM Packages Distribution Support</title>
+                    <tgroup align="left" cols="5" colsep="1" rowsep="1">
+                        <colspec colname="c1"></colspec>
+                        <colspec colname="c2"></colspec>
+                        <colspec colname="c3"></colspec>
+                        <colspec colname="c4"></colspec>
+                        <colspec colname="c5" colnum="5"></colspec>
+                        <thead>
+                            <row>
+                                <entry align="center" nameend="c4" namest="c1">
+                                    Distribution Information
+                                </entry>
+                                <entry morerows="1">
+                                    EOS / EOL Date
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    Name
+                                </entry>
+                                <entry>
+                                    CodeName
+                                </entry>
+                                <entry>
+                                    Version
+                                </entry>
+                                <entry>
+                                    Architectures
+                                </entry>
+
+                            </row>
+
+                        </thead>
+                        <!--
                     <tfoot> <row>
                         <entry>
                             f1
@@ -95,299 +100,299 @@
                     </row>
                     </tfoot>
                     --> <tbody>
-                        <row>
-                            <entry>
-                                CentOS
-                            </entry>
-                            <entry>
-                                -
-                            </entry>
-                            <entry>
-                                5
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q1, 2014
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                CentOS
-                            </entry>
-                            <entry>
-                                -
-                            </entry>
-                            <entry>
-                                6
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q4, 2017
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Fedora
-                            </entry>
-                            <entry>
-                                Goddard
-                            </entry>
-                            <entry>
-                                13
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Q2, 2011
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Fedora
-                            </entry>
-                            <entry>
-                                Laughlin
-                            </entry>
-                            <entry>
-                                14
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Q4, 2011
-                            </entry>
+                            <row>
+                                <entry>
+                                    CentOS
+                                </entry>
+                                <entry>
+                                    -
+                                </entry>
+                                <entry>
+                                    5
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Approximately Q1, 2014
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    CentOS
+                                </entry>
+                                <entry>
+                                    -
+                                </entry>
+                                <entry>
+                                    6
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Approximately Q4, 2017
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    Fedora
+                                </entry>
+                                <entry>
+                                    Goddard
+                                </entry>
+                                <entry>
+                                    13
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Q2, 2011
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    Fedora
+                                </entry>
+                                <entry>
+                                    Laughlin
+                                </entry>
+                                <entry>
+                                    14
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Q4, 2011
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    Red Hat Enterprise Linux
+                                </entry>
+                                <entry>
+                                    Tikanga
+                                </entry>
+                                <entry>
+                                    5
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Approximately Q1, 2014
+                                </entry>
+
+                            </row>
+                            <row>
+                                <entry>
+                                    Red Hat Enterprise Linux
+                                </entry>
+                                <entry>
+                                    Santiago
+                                </entry>
+                                <entry>
+                                    6
+                                </entry>
+                                <entry>
+                                    i386, amd64
+                                </entry>
+                                <entry>
+                                    Approximately Q4, 2017
+                                </entry>
+
+                            </row>
+
+                        </tbody>
+
+                    </tgroup>
+
+                </table>
 
-                        </row>
-                        <row>
-                            <entry>
-                                Red Hat Enterprise Linux
-                            </entry>
-                            <entry>
-                                Tikanga
-                            </entry>
-                            <entry>
-                                5
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q1, 2014
-                            </entry>
-
-                        </row>
-                        <row>
-                            <entry>
-                                Red Hat Enterprise Linux
-                            </entry>
-                            <entry>
-                                Santiago
-                            </entry>
-                            <entry>
-                                6
-                            </entry>
-                            <entry>
-                                i386, amd64
-                            </entry>
-                            <entry>
-                                Approximately Q4, 2017
-                            </entry>
-
-                        </row>
-
-                    </tbody>
-
-                </tgroup>
-
-            </table>
-
-        </para>
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Prerequisites">
-            <title>Prerequisites</title>
-            <para>
-                Before the installation, it is necessary to add the Kolab repositories to have access to all needed packages.
             </para>
-            <section id="sect-Installation_Guide-Prerequisites-CentOS">
-                <title>CentOS</title>
+            <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Prerequisites">
+                <title>Prerequisites</title>
                 <para>
-                    For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+                    Before the installation, it is necessary to add the Kolab repositories to have access to all needed packages.
                 </para>
-                <note>
-                    <title>Disable 'addons' and 'extras' repositories</title>
+                <section id="sect-Installation_Guide-Prerequisites-CentOS">
+                    <title>CentOS</title>
                     <para>
-                        Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
+                        For full instructions on installing Kolab Groupware on CentOS, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
                     </para>
-                    <para>
-                        The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
-                    </para>
-
-                </note>
-
-            </section>
-
-            <section id="sect-Installation_Guide-Prerequisites-Fedora">
-                <title>Fedora</title>
-                <para>
-                    TODO: is this correct? For full instructions on installing Kolab Groupware on Fedora, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
-                </para>
-
-            </section>
-
-            <section id="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux">
-                <title>Red Hat Enterprise Linux</title>
-                <para>
-                    The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
-                </para>
-                <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
-                    <title>Installing the <application>epel-release</application> Package</title>
-                    <step>
+                    <note>
+                        <title>Disable 'addons' and 'extras' repositories</title>
                         <para>
-                            Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                            Please be aware that on CentOS, you will need to disable the 'addons' and 'extras' repositories, as they contain packages not part of the Enterprise Linux base operating system.
                         </para>
                         <para>
-                            <itemizedlist>
-                                <listitem>
-                                    <para>
-                                        <ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
-                                    </para>
-
-                                </listitem>
-                                <listitem>
-                                    <para>
-                                        <ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
-                                    </para>
+                            The disable these repositories, edit <filename>/etc/yum.repos.d/CentOS-Base.repo</filename> and append a setting <code>enabled=0</code> to sections <code>[addons]</code> and <code>[extras]</code>, or delete the sections entirely.
+                        </para>
 
-                                </listitem>
+                    </note>
 
-                            </itemizedlist>
+                </section>
 
-                        </para>
+                <section id="sect-Installation_Guide-Prerequisites-Fedora">
+                    <title>Fedora</title>
+                    <para>
+                        TODO: is this correct? For full instructions on installing Kolab Groupware on Fedora, please refer to the instructions in <xref linkend="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux" />.
+                    </para>
 
-                    </step>
-                    <step>
-                        <para>
-                            Install this package using the following command:
-                        </para>
-                        <para>
+                </section>
 
-<screen># <userinput>wget http://url/to/rpm</userinput>
-<userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
+                <section id="sect-Installation_Guide-Prerequisites-Red_Hat_Enterprise_Linux">
+                    <title>Red Hat Enterprise Linux</title>
+                    <para>
+                        The <ulink url="http://fedoraproject.org/wiki/EPEL">EPEL</ulink> repository is required for Kolab Groupware on Enterprise Linux 5. Install the EPEL repository using the following procedure:
+                    </para>
+                    <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_epel_release_Package">
+                        <title>Installing the <application>epel-release</application> Package</title>
+                        <step>
+                            <para>
+                                Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                            </para>
+                            <para>
+                                <itemizedlist>
+                                    <listitem>
+                                        <para>
+                                            <ulink url="http://download.fedora.redhat.com/pub/epel/5/i386/repoview/epel-release.html">Enterprise Linux 5</ulink> (Tikanga)
+                                        </para>
 
-                        </para>
+                                    </listitem>
+                                    <listitem>
+                                        <para>
+                                            <ulink url="http://download.fedora.redhat.com/pub/epel/6/i386/repoview/epel-release.html">Enterprise Linux 6</ulink> (Santiago)
+                                        </para>
 
-                    </step>
+                                    </listitem>
 
-                </procedure>
+                                </itemizedlist>
 
-                <para condition="enterprise">
-                    For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
-                </para>
-                <para>
-                    The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
-                </para>
-                <para>
-                    <orderedlist>
-                        <listitem condition="community">
-                            <para>
-                                <literal>kolab-&PRODUCT_VERSION;-community-release</literal>
                             </para>
 
-                        </listitem>
-                        <listitem condition="enterprise">
+                        </step>
+                        <step>
                             <para>
-                                <literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
+                                Install this package using the following command:
                             </para>
-
-                        </listitem>
-                        <listitem condition="community">
                             <para>
-                                <literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
-                            </para>
 
-                        </listitem>
-                        <listitem condition="enterprise">
-                            <para>
-                                <literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
+<screen># <userinput>wget http://url/to/rpm</userinput>
+<userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
+
                             </para>
 
-                        </listitem>
+                        </step>
 
-                    </orderedlist>
+                    </procedure>
 
-                </para>
-                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
-                    <title>Stable Software</title>
-                    <para>
-                        Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
+                    <para condition="enterprise">
+                        For access to the Enterprise edition, you have been issued a SSL certificate by Kolab Systems. How to obtain, renew and use the SSL certificate to provide you with access to the Enterprise editions, please read <ulink url="https://support.kolabsys.com/Obtaining,_Renewing_and_Using_a_Client_SSL_Certificate" />.
                     </para>
-
-                </formalpara>
-                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
-                    <title>Stable Software Currently in Testing</title>
                     <para>
-                        The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
+                        The Kolab software repositories for Red Hat Enterprise Linux ship two so-called <literal>-release</literal> packages;
                     </para>
-
-                </formalpara>
-                <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
-                    <title>Software Currently in Development</title>
                     <para>
-                        Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
+                        <orderedlist>
+                            <listitem condition="community">
+                                <para>
+                                    <literal>kolab-&PRODUCT_VERSION;-community-release</literal>
+                                </para>
+
+                            </listitem>
+                            <listitem condition="enterprise">
+                                <para>
+                                    <literal>kolab-&PRODUCT_VERSION;-enterprise-release</literal>
+                                </para>
+
+                            </listitem>
+                            <listitem condition="community">
+                                <para>
+                                    <literal>kolab-&PRODUCT_VERSION;-community-release-development</literal>
+                                </para>
+
+                            </listitem>
+                            <listitem condition="enterprise">
+                                <para>
+                                    <literal>kolab-&PRODUCT_VERSION;-enterprise-release-development</literal>
+                                </para>
+
+                            </listitem>
+
+                        </orderedlist>
+
                     </para>
+                    <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software">
+                        <title>Stable Software</title>
+                        <para>
+                            Stable software, versions of packages deemed ready for general availability and production environments are distributed through two repositories, <emphasis>release</emphasis> and <emphasis>updates</emphasis>. These repositories are configured on the system, and enabled by default, by installing the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package;
+                        </para>
 
-                </formalpara>
-                <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
-                    <title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
-                    <step>
+                    </formalpara>
+                    <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Stable_Software_Currently_in_Testing">
+                        <title>Stable Software Currently in Testing</title>
                         <para>
-                            Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                            The <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package also installs a repository through which upcoming updates currently in their testing phase are distributed. This repository is called <emphasis>updates-testing</emphasis>, and is not enabled by default. Through Kolab Systems and/or community support channels, you may be asked to test an update distributed through the updates-testing repository to see if it fixes a bug you have reported. You would then, typically, temporarily enable the updates-testing repository by supplying the <literal>--enablerepo=kolab-2.4-updates-testing</literal> command-line option to YUM, overriding the system configuration file setting.
                         </para>
+
+                    </formalpara>
+                    <formalpara id="form-Installation_Guide-Red_Hat_Enterprise_Linux-Software_Currently_in_Development">
+                        <title>Software Currently in Development</title>
                         <para>
-                            <itemizedlist>
-                                <listitem>
-                                    <para>
-                                        <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5 (FIXME: page missing) </ulink>
-                                    </para>
+                            Software that is currently in development for the product series you are running (in this case, series &PRODUCT_VERSION;) is available through the so-called <emphasis>development</emphasis> repository. This software is considered unstable. By default, you will not have the package installed that provides the configuration for this repository; the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release-development</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release-development</literal> package. Installing this package will cause the <emphasis>development</emphasis> repository to be enabled by default.
+                        </para>
 
-                                </listitem>
-                                <listitem>
-                                    <para>
-                                        <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6 (FIXME: page missing) </ulink>
-                                    </para>
+                    </formalpara>
+                    <procedure id="proc-Installation_Guide-Red_Hat_Enterprise_Linux-Installing_the_kolab_PRODUCT_VERSION_community_release_Package">
+                        <title>Installing the <application>kolab-&PRODUCT_VERSION;-community-release</application> Package</title>
+                        <step>
+                            <para>
+                                Depending on the version of Red Hat Enterprise Linux, install the package as it is listed on the following page:
+                            </para>
+                            <para>
+                                <itemizedlist>
+                                    <listitem>
+                                        <para>
+                                            <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 5 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el5/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 5 (FIXME: page missing) </ulink>
+                                        </para>
 
-                                </listitem>
+                                    </listitem>
+                                    <listitem>
+                                        <para>
+                                            <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-community-release.html">Enterprise Linux 6 (FIXME: page missing)</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.4/el6/release/i386/repoview/kolab-2.4-enterprise-release.html">Enterprise Linux 6 (FIXME: page missing) </ulink>
+                                        </para>
 
-                            </itemizedlist>
+                                    </listitem>
 
-                        </para>
+                                </itemizedlist>
 
-                    </step>
-                    <step>
-                        <para>
-                            Install this package using the following command:
-                        </para>
-                        <para>
+                            </para>
+
+                        </step>
+                        <step>
+                            <para>
+                                Install this package using the following command:
+                            </para>
+                            <para>
 
 <screen># <userinput>wget http://url/to/rpm</userinput>
 <userinput># yum localinstall --nogpgcheck /path/to/rpm</userinput></screen>
 
-                        </para>
+                            </para>
 
-                    </step>
-                    <step>
-                        <para>
-                            To test the installation of the repository configuration, please execute:
-                        </para>
-                        <para>
+                        </step>
+                        <step>
+                            <para>
+                                To test the installation of the repository configuration, please execute:
+                            </para>
+                            <para>
 
 <screen># <userinput>yum repolist</userinput>
 (...snip...)
@@ -395,18 +400,18 @@ kolab-&PRODUCT_VERSION;
 kolab-&PRODUCT_VERSION;-updates
 (...snip...)</screen>
 
-                        </para>
-                        <note>
-                            <title>Output Abbreviated</title>
-                            <para>
-                                Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
                             </para>
+                            <note>
+                                <title>Output Abbreviated</title>
+                                <para>
+                                    Note that the output is abbreviated for clarity. The output may actually include the description of the repository, and the number of packages available.
+                                </para>
 
-                        </note>
-                        <para>
-                            Optionally, to see which repositories have been configured though not enabled, also execute:
-                        </para>
-                        <para>
+                            </note>
+                            <para>
+                                Optionally, to see which repositories have been configured though not enabled, also execute:
+                            </para>
+                            <para>
 
 <screen># <userinput>yum repolist all</userinput>
 (...snip...)
@@ -421,69 +426,72 @@ kolab-&PRODUCT_VERSION;-updates-testing-debuginfo
 kolab-&PRODUCT_VERSION;-updates-testing-source
 (...snip...)</screen>
 
-                        </para>
-                        <note>
-                            <title>Output Abbreviated</title>
-                            <para>
-                                Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
                             </para>
+                            <note>
+                                <title>Output Abbreviated</title>
+                                <para>
+                                    Note that the output is abbreviated for clarity. The output may actually include the description of the repository, whether the repository is enabled by default or not, and the number of packages available in each repository as well as the total number of packages.
+                                </para>
 
-                        </note>
+                            </note>
 
-                    </step>
-                    <step>
-                        <para>
-                            At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
-                        </para>
-                        <para>
+                        </step>
+                        <step>
+                            <para>
+                                At this stage of the Kolab Groupware &PRODUCT_VERSION; development and release cycle, you may require to install the development repository as well. To do so, execute the following command:
+                            </para>
+                            <para>
 
 <screen># <userinput>yum -y install kolab-&PRODUCT_VERSION;-community-release-development</userinput></screen>
 
-                        </para>
-                        <warning>
-                            <title>Development Repository Contains Unstable Software</title>
-                            <para>
-                                The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
                             </para>
+                            <warning>
+                                <title>Development Repository Contains Unstable Software</title>
+                                <para>
+                                    The development repository contains unstable software, in that new versions of the software can be released through the development repository quickly, for testing purposes, before they are approved to the updates-testing stage.
+                                </para>
 
-                        </warning>
+                            </warning>
 
-                    </step>
+                        </step>
 
-                </procedure>
+                    </procedure>
 
-                <para>
-                    Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
-                </para>
+                    <para>
+                        Please consider using <application>yum-priorities</application> as described in <xref linkend="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts" />.
+                    </para>
 
-            </section>
+                </section>
 
-            <section id="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts">
-                <title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
-                <para>
-                    Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
-                </para>
-                <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
-                    <title>Installing and Configuring YUM priorities</title>
-                    <step>
-                        <para>
-                            The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
-                        </para>
-                        <para>
+                <section id="sect-Installation_Guide-Prerequisites-Using_yum_priorities_to_Avoid_Package_Conflicts">
+                    <title>Using <application>yum-priorities</application> to Avoid Package Conflicts</title>
+                    <para>
+                        Since any given package may, at any time, be or become available to the system through both the Kolab repositories as well as through the regular distribution repositories, to avoid the risk of switching back and forth between the two different versions continuously, by mistake or by accident, we recommend you use the following procedure including employing YUM repository priorities to eliminate the risk of running in such problems in the future.
+                    </para>
+                    <procedure id="proc-Installation_Guide-Using_yum_priorities_to_Avoid_Package_Conflicts-Installing_and_Configuring_YUM_priorities">
+                        <title>Installing and Configuring YUM priorities</title>
+                        <step>
+                            <para>
+                                The <application>yum-priorities</application> is available from the <ulink url="http://fedoraproject.org/wiki/EPEL">package repository</ulink>. Please install it:
+                            </para>
+                            <para>
 
 <screen># <userinput>yum install yum-priorities</userinput></screen>
 
-                        </para>
+                            </para>
 
-                    </step>
-                    <step>
-                        <para>
-                            The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other than the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
-                        </para>
+                        </step>
+                        <step>
+                            <para>
+                                The repositories that have been installed using the <literal condition="community">kolab-&PRODUCT_VERSION;-community-release</literal><literal condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</literal> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. This will set the correct priorities, unless you have repositories configured other than the base operating system repositories (not including 'addons' and 'extras' on CentOS platforms), EPEL and the Kolab Groupware repositories. Should the system happen to already make use of YUM priorities, please make sure the Kolab repositories have the appropriate priority.
+                            </para>
+
+                        </step>
+
+                    </procedure>
 
-                    </step>
 
-                </procedure>
+                </section>
 
 
             </section>
@@ -497,7 +505,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
     <section id="sect-Installation_Guide-Installation-Full_default_installation_on_a_single_server">
         <title>Full default installation on a single server</title>
         <para>
-            If you want a default installation of a components on a single server, pleas run:
+            If you want a default installation with all components on a single server, pleas run:
 <screen># <userinput>yum install kolab-groupware-server</userinput></screen>
             This meta-package will install all needed components.
         </para>
diff --git a/Installation_Guide/en-US/Kontact.xml b/Installation_Guide/en-US/Kontact.xml
index eb2f9b1..641c17a 100755
--- a/Installation_Guide/en-US/Kontact.xml
+++ b/Installation_Guide/en-US/Kontact.xml
@@ -6,41 +6,45 @@
 <chapter id="chap-Installation_Guide-Kontact">
     <title>Kontact</title>
     <para>
-	    <application>Kontact</application> is the offical KDE PIM client, consisting of an email client (<application>KMail</application>) ,
-	    an address book (<application>KAddressbook</application>) and an Organizer (<application>KOrganizer</application>).
-	    Kontact is part of the KDE Software Compilation.
+        <application>Kontact</application> is the offical KDE PIM client, consisting of an email client (<application>KMail</application>) , an address book (<application>KAddressbook</application>) and an Organizer (<application>KOrganizer</application>). Kontact is part of the KDE Software Compilation.
     </para>
-    <section>
-	    <title>Installation</title>
-	    <para>
-		   Kontact is available on all major linux distributions, and can be installed trough the native package management system. While the standard version provides all features, Kolab maintains enterprise versions for improved stability.
-	    </para>
-	    <para>
-		    To install the complete Kontact suite:
-		    <screen># <userinput>yum install kontact</userinput></screen>
-		    alternatively each component can be installed individually.
-	    </para>
+    <section id="sect-Installation_Guide-Kontact-Installation">
+        <title>Installation</title>
+        <para>
+            Kontact is available on all major linux distributions, and can be installed trough the native package management system. While the standard version provides all features, Kolab maintains enterprise versions for improved stability.
+        </para>
+        <para>
+            To install the complete Kontact suite:
+<screen># <userinput>yum install kontact</userinput></screen>
+            alternatively each component can be installed individually.
+        </para>
+
     </section>
-    <section>
-	<title>Configuration</title>
-	<para>
-	    The synchronisation with the Kolab Groupware server can either be configured manually or with the Kolabwizard.
-	</para>
-	<section>
-	    <title>Configuration through the KolabWizard</title>
-	    <para>
-		    The KolabWizard will guide you trough, the setup process step by step.
-		    If you experience any problems please follow the Manual Configuration.
-	    </para>
-	</section>
-	<section>
-		<title>Manual Configuration of Kontact</title>
-		<para>
-			
-		</para>
-	</section>
+
+    <section id="sect-Installation_Guide-Kontact-Configuration">
+        <title>Configuration</title>
+        <para>
+            The synchronisation with the Kolab Groupware server can either be configured manually or with the Kolabwizard.
+        </para>
+        <section id="sect-Installation_Guide-Configuration-Configuration_through_the_KolabWizard">
+            <title>Configuration through the KolabWizard</title>
+            <para>
+                The KolabWizard will guide you trough, the setup process step by step. If you experience any problems please follow the Manual Configuration.
+            </para>
+
+        </section>
+
+        <section id="sect-Installation_Guide-Configuration-Manual_Configuration_of_Kontact">
+            <title>Manual Configuration of Kontact</title>
+            <para>
+
+            </para>
+
+        </section>
+
+
     </section>
-    
+
 
 </chapter>
 
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
index b4e6483..ef8cfaa 100755
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -5,6 +5,7 @@
 ]>
 <part id="part-Installation_Guide-Kolab_Groupware_Server">
     <title>Kolab Groupware Server</title>
+    <xi:include href="Preparing_the_System.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />


commit 9a01ace1da1a23089e0a4e3ec1ef539c4b4267bd
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jul 20 16:34:05 2011 +0200

    remove the old bootstrapping chapter, which was replaced by a new one

diff --git a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
deleted file mode 100755
index 5e73d23..0000000
--- a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="chap-Installation_Guide-Bootstrapping_the_Kolab_Installation">
-    <title>Bootstrapping the Kolab Installation</title>
-    <para>
-        Various scenarios require various installation procedures.
-    </para>
-    <important>
-        <title>Infrastructure Matters</title>
-        <para>
-            The infrastructure around the Kolab environment matters. The system's hostname, <emphasis>Fully Qualified Domain Name</emphasis> (FQDN) and other infrastructural aspects impact the installation procedure as well as the resulting runtime environment. The Deployment Guide has more details.
-        </para>
-
-    </important>
-    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Preparing_the_System_for_Bootstrapping">
-        <title>Preparing the System for Bootstrapping</title>
-        <para>
-            Preparing the system for bootstrapping it requires any services that the Kolab Groupware is going to create, maintain and/or manage need to be shut down prior to bootstrapping.
-        </para>
-        <para>
-            The following ports are being checked for running services, in numeric order:
-        </para>
-        <para>
-            <orderedlist>
-                <listitem>
-                    <para>
-                        24
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        25
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        80
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        110
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        143
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        443
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        389
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        465
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        587
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        636
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        993
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        995
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        2000
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        2003
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        9999
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        10024
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        10025
-                    </para>
-
-                </listitem>
-                <listitem>
-                    <para>
-                        10026
-                    </para>
-
-                </listitem>
-
-            </orderedlist>
-            <note>
-                <title>Identifying blocked ports</title>
-                <para>
-                    If the process fails due to running services and also
-<screen># <userinput>/usr/sbin/kolabsrv rc all stop</userinput></screen>
-                    does not help, the ports can be checked using:
-<screen># <userinput>lsof -Pnl +M -i4</userinput></screen>
-                    on an IPv4 network and
-<screen># <userinput>lsof -Pnl +M -i6</userinput></screen>
-                    for iPv6. Alternatively
-<screen># <userinput>netstat -tulpn</userinput></screen>
-                    should give you the same info. Stop all services running on one of the aforementioned ports:
-<screen># <userinput>/etc/rc.d/init.d/sendmail stop</userinput></screen>
-
-                </para>
-
-            </note>
-
-        </para>
-
-    </section>
-
-    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Kolab_Environment">
-        <title>New Kolab Environment</title>
-        <para>
-            Issue the following command to bootstrap a new Kolab environment with OpenLDAP as the LDAP server technology:
-        </para>
-        <para>
-
-<screen># <userinput>kolab_bootstrap -b</userinput></screen>
-
-        </para>
-        <para>
-            Follow the directions in this process.
-        </para>
-
-    </section>
-
-    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Manual_Bootstrap_process">
-        <title>Manual Bootstrap process</title>
-        <para>
-            Instead of using the kolab_bootstrap utility, the services can also be started manually
-        </para>
-        <warning>
-            <title>Ensure that ports are free</title>
-            <para>
-                Please ensure first that all aforementioned ports are free
-            </para>
-
-        </warning>
-        <para>
-            The following services need to be started in this order (the order is mandatory). If you did not use the default components (i.e. dovecot instead of cyrus), you will have to adjust the commands accordingly accordingly.
-        </para>
-        <itemizedlist id="item-Installation_Guide-Manual_Bootstrap_process-Services_to_start">
-            <title>Services to start</title>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-LDAP">
-                    <title><code>LDAP</code></title>
-                    <para>
-
-<screen># <userinput>/etc/init.d/ldap start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-SASL">
-                    <title><code>SASL</code></title>
-                    <para>
-
-<screen># <userinput>/etc/init.d/saslauthd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-Amavis">
-                    <title><code>Amavis</code></title>
-                    <para>
-
-<screen># <userinput>/etc/rc.d/init.d/amavisd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-Clamav">
-                    <title><code>Clamav</code></title>
-                    <para>
-
-<screen># <userinput>/etc/rc.d/init.d/clamd.amavisd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-cyrus_IMAP">
-                    <title><code>cyrus-IMAP</code></title>
-                    <para>
-
-<screen># <userinput>/etc/rc.d/init.d/cyrus-imapd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-Postfix">
-                    <title><code>Postfix</code></title>
-                    <para>
-
-<screen># <userinput>/etc/rc.d/init.d/postfix start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-Kolabd">
-                    <title><code>Kolabd</code></title>
-                    <para>
-
-<screen># <userinput>/etc/init.d/kolabd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-            <listitem>
-                <formalpara id="form-Installation_Guide-Services_to_start-HTTP_Server">
-                    <title><code>HTTP Server</code></title>
-                    <para>
-
-<screen># <userinput>/etc/init.d/httpd start</userinput></screen>
-
-                    </para>
-
-                </formalpara>
-
-            </listitem>
-
-        </itemizedlist>
-
-    </section>
-
-    <section condition="enterprise" id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Kolab_Environment_with_Existing_LDAP">
-        <title>New Kolab Environment with Existing LDAP</title>
-        <para>
-            When not using the OpenLDAP server –but instead using a new deployment of a different LDAP server technology or perhaps an existing LDAP Directory Server deployment, kolab_bootstrap is not to be used.
-        </para>
-        <para>
-            Instead, the Kolab Groupware configuration file in <filename>/etc/kolab/kolab.conf</filename> can be manually supplied. A full reference of all settings available is in <filename>/etc/kolab/kolab.globals</filename>, most of which are settings for the platform. An overview of relevant settings to include in <filename>/etc/kolab/kolab.conf</filename> is in
-        </para>
-        <para>
-            <itemizedlist id="item-Installation_Guide-New_Kolab_Environment_with_Existing_LDAP-Basic_Settings_to_Include_in_etckolabkolab.conf">
-                <title>Basic Settings to Include in <filename>/etc/kolab/kolab.conf</filename></title>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-fqdnhostname">
-                        <title><code>fqdnhostname</code></title>
-                        <para>
-                            The fully qualified hostname for this system.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-_is_master">
-                        <title> <code> is_master</code></title>
-                        <para>
-                            Whether this server is a Kolab master server or not. When using a different LDAP technology than OpenLDAP, or when using a directory tree external to Kolab, set this to <code>false</code>.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-base_dn">
-                        <title><code>base_dn</code></title>
-                        <para>
-                            The Base DN for the LDAP tree, for example <emphasis>dc=example,dc=org</emphasis>
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-bind_dn">
-                        <title><code>bind_dn</code></title>
-                        <para>
-                            The <emphasis>distinguished name</emphasis> Kolab should use binding to the LDAP server.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-bind_pw">
-                        <title><code>bind_pw</code></title>
-                        <para>
-                            The password to use when binding.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-ldap_uri">
-                        <title><code>ldap_uri</code></title>
-                        <para>
-                            The URI to the LDAP server to use.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_dn">
-                        <title><code>php_dn</code></title>
-                        <para>
-                            The <emphasis>distinguished name</emphasis> to use to bind to the LDAP server, specifically for Kolab PHP process such as the Kolab mail filter.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_pw">
-                        <title><code>php_pw</code></title>
-                        <para>
-                            The password to use with the <xref linkend="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_dn" />.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_id">
-                        <title><code>calendar_id</code></title>
-                        <para>
-                            The ID for calendaring used with Resources. A user 'calendar at domain' will be created in LDAP and as a mailbox.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-                <listitem>
-                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_pw">
-                        <title><code>calendar_pw</code></title>
-                        <para>
-                            The password to use for the <xref linkend="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_id" />.
-                        </para>
-
-                    </formalpara>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-
-    </section>
-
-    <section condition="enterprise" id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Slave_to_Existing_Kolab_Environment">
-        <title>New Slave to Existing Kolab Environment</title>
-        <para>
-            Walk through adding the host information to the existing environment, ssh-key exchange (optional), bootstrapping
-        </para>
-
-    </section>
-
-
-</chapter>
-


commit 064c5bb5ce4323a983ce5c9d1c6602070158ff67
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jul 20 16:33:32 2011 +0200

    include cyrus_imap docs, various small changes

diff --git a/Installation_Guide/en-US/Cyrus_IMAP.xml b/Installation_Guide/en-US/Cyrus_IMAP.xml
old mode 100644
new mode 100755
index 5e27ce4..0335ed3
--- a/Installation_Guide/en-US/Cyrus_IMAP.xml
+++ b/Installation_Guide/en-US/Cyrus_IMAP.xml
@@ -17,7 +17,7 @@
         <formalpara id="form-Installation_Guide-Installation_of_Cyrus_IMAP-Kolab_Systems_Repository_Configuration">
             <title>Kolab Systems Repository Configuration</title>
             <para>
-                Make sure you have the Kolab Systems software repositories configured properly on the system, before executing any of the following commands. For more information on configuring the Kolab Systems software repositories, please refer to <xref linkend="sect-Installation_Guide-Obtaining_Kolab_Software-Repository_Configuration" />.
+                Make sure you have the Kolab Systems software repositories configured properly on the system, before executing any of the following commands. For more information on configuring the Kolab Systems software repositories, please refer to TODO Repository Configuration<!--  xref linkend="sect-Installation_Guide-Obtaining_Kolab_Software-Repository_Configuration" /  -->.
             </para>
 
         </formalpara>
diff --git a/Installation_Guide/en-US/Installation_Guide.xml b/Installation_Guide/en-US/Installation_Guide.xml
old mode 100644
new mode 100755
index 8b7bf9e..7e431af
--- a/Installation_Guide/en-US/Installation_Guide.xml
+++ b/Installation_Guide/en-US/Installation_Guide.xml
@@ -8,6 +8,7 @@
     <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="part-Kolab_Server.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="part-Kolab_Clients.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <index />
 </book>
diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index 78190d0..c88df8d 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -205,7 +205,7 @@
                     </para>
                     <listitem>
                         <para>
-                            Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
+			    <xref linkend="part-Installation_Guide-Cyrus_IMAP" />
                         </para>
 
                     </listitem>
@@ -257,6 +257,9 @@
             <para>
                 <filename>/etc/postfix/main.cf</filename>
             </para>
+	    <para>
+		The Postfix main.cf configuration file specifies a very small subset of all the parameters that control the operation of the Postfix mail system. Parameters not explicitly specified are left at their default values.
+            </para>
             <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
                 <title>tls-cert</title>
 
@@ -307,37 +310,38 @@
                 <filename>/etc/postfix/master.cf</filename>
             </para>
             <para>
+		The  master.cf configuration file defines how a client program connects to a service, and what daemon program runs when a service is requested.
                 TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
             </para>
+	    <note>
+		    <title>Manpage</title>
+		    <para>
+			    <userinput>man 5 master</userinput>
+		    </para>
+	    </note>
             <para>
                 <filename>/etc/postfix/ldap/mydestination.cf</filename>
             </para>
             <para>
-                What is it good for?
+                Used for an ldap lookup of the mydestination parameter in main.cf.
             </para>
             <para>
                 <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
             </para>
             <para>
-                What is it good for?
+                Used for an ldap lookup of the local_recipient_maps parameter in main.cf
             </para>
             <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
             </para>
-            <para>
-                What is it good for?
-            </para>
-            <para>
+	    <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
             </para>
-            <para>
-                What is it good for?
-            </para>
-            <para>
+	    <para>
                 <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
             </para>
             <para>
-                What is it good for?
+                Used for an ldap lookup of the virtual_alias_maps parameter in main.cf
             </para>
             <important>
                 <title>Adjust example.org domain names</title>
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index e8f9028..15c269b 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -28,7 +28,7 @@
     <section id="sect-Installation_Guide-Installation-Installation_with_APT_Packages">
         <title>Installation with APT Packages</title>
         <para>
-            bblablablablabl
+            APT packages are being provided for the following Linux distributions and versions:
         </para>
 
     </section>
diff --git a/Installation_Guide/en-US/Kontact.xml b/Installation_Guide/en-US/Kontact.xml
old mode 100644
new mode 100755
index 9fccdcb..eb2f9b1
--- a/Installation_Guide/en-US/Kontact.xml
+++ b/Installation_Guide/en-US/Kontact.xml
@@ -6,8 +6,41 @@
 <chapter id="chap-Installation_Guide-Kontact">
     <title>Kontact</title>
     <para>
-        para
+	    <application>Kontact</application> is the offical KDE PIM client, consisting of an email client (<application>KMail</application>) ,
+	    an address book (<application>KAddressbook</application>) and an Organizer (<application>KOrganizer</application>).
+	    Kontact is part of the KDE Software Compilation.
     </para>
+    <section>
+	    <title>Installation</title>
+	    <para>
+		   Kontact is available on all major linux distributions, and can be installed trough the native package management system. While the standard version provides all features, Kolab maintains enterprise versions for improved stability.
+	    </para>
+	    <para>
+		    To install the complete Kontact suite:
+		    <screen># <userinput>yum install kontact</userinput></screen>
+		    alternatively each component can be installed individually.
+	    </para>
+    </section>
+    <section>
+	<title>Configuration</title>
+	<para>
+	    The synchronisation with the Kolab Groupware server can either be configured manually or with the Kolabwizard.
+	</para>
+	<section>
+	    <title>Configuration through the KolabWizard</title>
+	    <para>
+		    The KolabWizard will guide you trough, the setup process step by step.
+		    If you experience any problems please follow the Manual Configuration.
+	    </para>
+	</section>
+	<section>
+		<title>Manual Configuration of Kontact</title>
+		<para>
+			
+		</para>
+	</section>
+    </section>
+    
 
 </chapter>
 
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
index 2962913..b4e6483 100755
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -9,8 +9,5 @@
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Bootstrapping.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <!--
-    <xi:include href="Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    //    -->
 </part>
 


commit a1e3db9c46f029ad95616c7827fc9d4e5210c143
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jul 20 09:53:47 2011 +0200

    Removed old files which have been fully merged into others

diff --git a/Installation_Guide/en-US/Installation_Introduction.xml b/Installation_Guide/en-US/Installation_Introduction.xml
deleted file mode 100644
index 3a4c111..0000000
--- a/Installation_Guide/en-US/Installation_Introduction.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="chap-Installation_Guide-Installation_Introduction">
-    <title>Installation Introduction</title>
-    <para>
-        Kolab Groupware is not just one big server component. It consists various, well-known, mature Open Source software components.
-    </para>
-</chapter>
-
diff --git a/Installation_Guide/en-US/Kolab_Initial_Configuration.xml b/Installation_Guide/en-US/Kolab_Initial_Configuration.xml
deleted file mode 100644
index 0730b55..0000000
--- a/Installation_Guide/en-US/Kolab_Initial_Configuration.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="chap-Installation_Guide-Kolab_Initial_Configuration">
-    <title>Kolab Initial Configuration</title>
-    <para>
-        para
-    </para>
-    <procedure>
-        <step>
-            <para>
-                Run, as root:
-            </para>
-            <para>
-
-<screen># <userinput>setup-kolab.pl</userinput></screen>
-
-            </para>
-            <para>
-                This will start a configuration dialog.
-            </para>
-
-        </step>
-        <step>
-            <para>
-                Yet Another Step...
-            </para>
-
-        </step>
-
-    </procedure>
-
-    <section id="sect-Installation_Guide-Kolab_Initial_Configuration-Manual_Configuration">
-        <title>Manual Configuration</title>
-        <para>
-            this section goes to manual configuration of Kolab (this is what setup-kolab.pl should actually be doing)
-        </para>
-
-<screen>
-after yum install kolab
-copy /etc/kolab/templates/kolab.conf.template to /etc/kolab/kolab.conf
-check out /etc/kolab/kolab.conf
-    - set the fqdn
-    - check
-</screen>
-
-    </section>
-
-    <section id="sect-Installation_Guide-Kolab_Initial_Configuration-Configuration_through_Puppet">
-        <title>Configuration through Puppet</title>
-        <para>
-            Assuming that you have an existing Puppet environment, you can clone the <literal>kolab</literal> puppet module:
-        </para>
-        <para>
-
-<screen>$ <userinput>git clone git://git.puppetmanaged.org/puppet/kolab</userinput></screen>
-
-        </para>
-
-    </section>
-
-
-</chapter>
-
diff --git a/Installation_Guide/en-US/Kolab_Webclient_Installation.xml b/Installation_Guide/en-US/Kolab_Webclient_Installation.xml
deleted file mode 100644
index 675ab1c..0000000
--- a/Installation_Guide/en-US/Kolab_Webclient_Installation.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<chapter id="chap-Installation_Guide-Kolab_Webclient_Installation">
-    <title>Kolab Webclient Installation</title>
-    <para>
-        para
-    </para>
-    <para>
-        <itemizedlist>
-            <listitem>
-                <para>
-                    how to configure the webserver to show the web interface over SSL only
-                </para>
-
-            </listitem>
-
-        </itemizedlist>
-
-    </para>
-    <section id="sect-Installation_Guide-Kolab_Webclient_Installation-Installing_Horde_Database">
-        <title>Installing Horde Database</title>
-        <para>
-            The following procedure ...
-        </para>
-        <procedure id="proc-Installation_Guide-Installing_Horde_Database-Installing_the_Horde_Database">
-            <title>Installing the Horde Database</title>
-            <step>
-                <para>
-                    Install the MySQL server package <application>mysql-server</application>:
-                </para>
-                <para>
-
-<screen># <userinput>yum -y install mysql-server</userinput></screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Configure the <application>mysqld</application> service to start on boot (runlevels 2 through 5):
-                </para>
-                <para>
-                    chkconfig mysqld on
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Edit <filename>/etc/my.cnf</filename>, and execute the following edits:
-                </para>
-                <para>
-                    <orderedlist>
-                        <listitem>
-                            <para>
-                                Set <code>old_passwords</code> to <code>0</code>.
-                            </para>
-
-                        </listitem>
-                        <listitem>
-                            <para>
-                                Make sure the InnoDB storage engine is enabled, by providing the MySQL server with the binary log settings:
-                            </para>
-                            <para>
-
-<screen># Make sure all logs are flushed on shutdown
-innodb_fast_shutdown=0
-
-innodb_file_per_table
-innodb_data_file_path = ibdata1:128M:autoextend</screen>
-
-                            </para>
-                            <note>
-                                <title>The Size Values are Defaults</title>
-                                <para>
-                                    Adjust the default size values as shown in this step of the procedure to your needs as appropriate.
-                                </para>
-
-                            </note>
-
-                        </listitem>
-
-                    </orderedlist>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Start the MySQL server for the first time:
-                </para>
-                <para>
-
-<screen># <userinput>service mysqld start</userinput>
-
-Initializing MySQL database:  Installing MySQL system tables...
-OK
-Filling help tables...
-OK
-
-To start mysqld at boot time you have to copy
-support-files/mysql.server to the right place for your system
-
-PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !
-To do so, start the server, then issue the following commands:
-/usr/bin/mysqladmin -u root password 'new-password'
-/usr/bin/mysqladmin -u root -h test90-2.test90.kolabsys.com password 'new-password'
-
-Alternatively you can run:
-/usr/bin/mysql_secure_installation
-
-which will also give you the option of removing the test
-databases and anonymous user created by default.  This is
-strongly recommended for production servers.
-
-See the manual for more instructions.
-
-You can start the MySQL daemon with:
-cd /usr ; /usr/bin/mysqld_safe &
-
-You can test the MySQL daemon with mysql-test-run.pl
-cd mysql-test ; perl mysql-test-run.pl
-
-Please report any problems with the /usr/bin/mysqlbug script!
-
-The latest information about MySQL is available on the web at
-http://www.mysql.com
-Support MySQL by buying support/licenses at http://shop.mysql.com
-                                                        [  OK  ]
-Starting MySQL:                                            [  OK  ]
-</screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Run the initial configuration and securing, and follow the instructions:
-                </para>
-                <para>
-
-<screen># <userinput>/usr/bin/mysql_secure_installation</userinput></screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Create the horde database:
-                </para>
-                <para>
-
-<screen># <userinput>mysql -p -e 'CREATE DATABASE horde;'</userinput></screen>
-
-                </para>
-
-            </step>
-            <step>
-                <para>
-                    Create the horde user and grant all privileges to the horde database to that horde user:
-                </para>
-                <para>
-
-<screen># <userinput>mysql -p -e 'GRANT ALL PRIVILEGES on `horde`.* TO</userinput>
-   <userinput>`horde`@`localhost` IDENTIFIED BY "YourPassword";'</userinput></screen>
-
-                </para>
-
-            </step>
-
-        </procedure>
-
-
-    </section>
-
-
-</chapter>
-


commit f7e903cc41c1949784161733b1dd4b7d0c924473
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jul 20 09:51:13 2011 +0200

    puppet configuration section

diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index cba3418..78190d0 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -28,6 +28,19 @@
 
     </section>
 
+    <section id="sect-Installation_Guide-Configuration-Configuration_through_Puppet">
+        <title>Configuration through Puppet</title>
+        <para>
+            TODO move to another guide? Assuming that you have an existing Puppet environment, you can clone the <literal>kolab</literal> puppet module:
+        </para>
+        <para>
+
+<screen>$ <userinput>git clone git://git.puppetmanaged.org/puppet/kolab</userinput></screen>
+
+        </para>
+
+    </section>
+
     <section id="sect-Installation_Guide-Configuration-Manual_Configuration">
         <title>Manual Configuration</title>
         <para>
@@ -84,6 +97,7 @@
             <para>
                 TODO: kolabd probably also needs a configuration file?
             </para>
+
         </section>
 
         <section id="sect-Installation_Guide-Manual_Configuration-Cyrus_IMAP_Configuration_default">


commit 74c1a42119b99ec7226eaf00dc63678c6a381411
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jul 20 09:28:14 2011 +0200

    added bootstrapping chapter

diff --git a/Installation_Guide/en-US/Kolab_Server_Bootstrapping.xml b/Installation_Guide/en-US/Kolab_Server_Bootstrapping.xml
new file mode 100755
index 0000000..59d2dc6
--- /dev/null
+++ b/Installation_Guide/en-US/Kolab_Server_Bootstrapping.xml
@@ -0,0 +1,425 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Installation_Guide-Bootstrapping_the_Kolab_Installation">
+    <title>Bootstrapping the Kolab Installation</title>
+    <para>
+        Various scenarios require various installation procedures.
+    </para>
+    <important>
+        <title>Infrastructure Matters</title>
+        <para>
+            The infrastructure around the Kolab environment matters. The system's hostname, <emphasis>Fully Qualified Domain Name</emphasis> (FQDN) and other infrastructural aspects impact the installation procedure as well as the resulting runtime environment. The Deployment Guide has more details.
+        </para>
+
+    </important>
+    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Preparing_the_System_for_Bootstrapping">
+        <title>Preparing the System for Bootstrapping</title>
+        <para>
+            Preparing the system for bootstrapping it requires any services that the Kolab Groupware is going to create, maintain and/or manage need to be shut down prior to bootstrapping.
+        </para>
+        <para>
+            The following ports are being checked for running services, in numeric order:
+        </para>
+        <para>
+            <orderedlist>
+                <listitem>
+                    <para>
+                        24
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        25
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        80
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        110
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        143
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        443
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        389
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        465
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        587
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        636
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        993
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        995
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        2000
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        2003
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        9999
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        10024
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        10025
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        10026
+                    </para>
+
+                </listitem>
+
+            </orderedlist>
+            <note>
+                <title>Identifying blocked ports</title>
+                <para>
+                    If the process fails due to running services and also
+<screen># <userinput>/usr/sbin/kolabsrv rc all stop</userinput></screen>
+                    does not help, the ports can be checked using:
+<screen># <userinput>lsof -Pnl +M -i4</userinput></screen>
+                    on an IPv4 network and
+<screen># <userinput>lsof -Pnl +M -i6</userinput></screen>
+                    for iPv6. Alternatively
+<screen># <userinput>netstat -tulpn</userinput></screen>
+                    should give you the same info. Stop all services running on one of the aforementioned ports:
+<screen># <userinput>/etc/rc.d/init.d/<replaceable>service</replaceable> stop</userinput></screen>
+
+                </para>
+
+            </note>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Kolab_Environment">
+        <title>New Kolab Environment</title>
+        <para>
+            Issue the following command to bootstrap a new Kolab environment:
+        </para>
+        <para>
+
+<screen># <userinput>kolabctl start</userinput></screen>
+
+        </para>
+        <para>
+            This will start all needed services and you kolab environemt is usable now.
+        </para>
+        <para>
+            Congratulations! You have finished the installation of you kolab groupware server.
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Manual_Bootstrap_process">
+        <title>Manual Bootstrap process</title>
+        <para>
+            Instead of using the kolabctl utility, the services can also be started manually
+        </para>
+        <warning>
+            <title>Ensure that ports are free</title>
+            <para>
+                Please ensure first that all aforementioned ports are free
+            </para>
+
+        </warning>
+        <para>
+            The following services need to be started in this order (the order is mandatory). If you did not use the default components (i.e. dovecot instead of cyrus), you will have to adjust the commands accordingly accordingly.
+        </para>
+        <itemizedlist id="item-Installation_Guide-Manual_Bootstrap_process-Services_to_start">
+            <title>Services to start</title>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-LDAP">
+                    <title><code>LDAP</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/ldap start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-SASL">
+                    <title><code>SASL</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/saslauthd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Amavis">
+                    <title><code>Amavis</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/amavisd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Clamav">
+                    <title><code>Clamav</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/clamd.amavisd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-cyrus_IMAP">
+                    <title><code>cyrus-IMAP</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/cyrus-imapd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Postfix">
+                    <title><code>Postfix</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/postfix start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Kolabd">
+                    <title><code>Kolabd</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/kolabd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-HTTP_Server">
+                    <title><code>HTTP Server</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/httpd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+
+        </itemizedlist>
+
+    </section>
+
+    <section condition="enterprise" id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Kolab_Environment_with_Existing_LDAP">
+        <title>New Kolab Environment with Existing LDAP</title>
+        <para>
+            TODO: update and move to another chapter or the admin guide When not using the OpenLDAP server –but instead using a new deployment of a different LDAP server technology or perhaps an existing LDAP Directory Server deployment, kolab_bootstrap is not to be used.
+        </para>
+        <para>
+            Instead, the Kolab Groupware configuration file in <filename>/etc/kolab/kolab.conf</filename> can be manually supplied. A full reference of all settings available is in <filename>/etc/kolab/kolab.globals</filename>, most of which are settings for the platform. An overview of relevant settings to include in <filename>/etc/kolab/kolab.conf</filename> is in
+        </para>
+        <para>
+            <itemizedlist id="item-Installation_Guide-New_Kolab_Environment_with_Existing_LDAP-Basic_Settings_to_Include_in_etckolabkolab.conf">
+                <title>Basic Settings to Include in <filename>/etc/kolab/kolab.conf</filename></title>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-fqdnhostname">
+                        <title><code>fqdnhostname</code></title>
+                        <para>
+                            The fully qualified hostname for this system.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-_is_master">
+                        <title> <code> is_master</code></title>
+                        <para>
+                            Whether this server is a Kolab master server or not. When using a different LDAP technology than OpenLDAP, or when using a directory tree external to Kolab, set this to <code>false</code>.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-base_dn">
+                        <title><code>base_dn</code></title>
+                        <para>
+                            The Base DN for the LDAP tree, for example <emphasis>dc=example,dc=org</emphasis>
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-bind_dn">
+                        <title><code>bind_dn</code></title>
+                        <para>
+                            The <emphasis>distinguished name</emphasis> Kolab should use binding to the LDAP server.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-bind_pw">
+                        <title><code>bind_pw</code></title>
+                        <para>
+                            The password to use when binding.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-ldap_uri">
+                        <title><code>ldap_uri</code></title>
+                        <para>
+                            The URI to the LDAP server to use.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_dn">
+                        <title><code>php_dn</code></title>
+                        <para>
+                            The <emphasis>distinguished name</emphasis> to use to bind to the LDAP server, specifically for Kolab PHP process such as the Kolab mail filter.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_pw">
+                        <title><code>php_pw</code></title>
+                        <para>
+                            The password to use with the <xref linkend="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-php_dn" />.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_id">
+                        <title><code>calendar_id</code></title>
+                        <para>
+                            The ID for calendaring used with Resources. A user 'calendar at domain' will be created in LDAP and as a mailbox.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+                <listitem>
+                    <formalpara id="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_pw">
+                        <title><code>calendar_pw</code></title>
+                        <para>
+                            The password to use for the <xref linkend="form-Installation_Guide-Basic_Settings_to_Include_in_etckolabkolab.conf-calendar_id" />.
+                        </para>
+
+                    </formalpara>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section condition="enterprise" id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-New_Slave_to_Existing_Kolab_Environment">
+        <title>New Slave to Existing Kolab Environment</title>
+        <para>
+            TODO: move to another chapter or guide? Walk through adding the host information to the existing environment, ssh-key exchange (optional), bootstrapping
+        </para>
+
+    </section>
+
+
+</chapter>
+
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
index 332b2c9..2962913 100755
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -8,7 +8,7 @@
     <xi:include href="Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Bootstrapping_the_Kolab_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Kolab_Server_Bootstrapping.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <!--
     <xi:include href="Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     //    -->


commit 8c9003ff76afd4ea35e9f1a524172bc7fa268ad0
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 19:15:31 2011 +0200

    merged webclient installation into server_configuration, + some random changes

diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index 6927b35..cba3418 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -79,6 +79,13 @@
 
         </section>
 
+        <section id="sect-Installation_Guide-Manual_Configuration-Kolab_deamon_Configuration">
+            <title>Kolab deamon Configuration</title>
+            <para>
+                TODO: kolabd probably also needs a configuration file?
+            </para>
+        </section>
+
         <section id="sect-Installation_Guide-Manual_Configuration-Cyrus_IMAP_Configuration_default">
             <title>Cyrus-IMAP Configuration (default)</title>
             <para>
@@ -378,17 +385,17 @@
         <section id="sect-Installation_Guide-Manual_Configuration-Webclient_Configuration">
             <title>Webclient Configuration</title>
             <para>
-                <filename>/path/to/file</filename>
-            </para>
-            <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
-                <title>title</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>
+                            how to configure the webserver to show the web interface over SSL only
+                        </para>
 
-<screen>var =    <replaceable>value</replaceable></screen>
-                <para>
-                    blabla
-                </para>
+                    </listitem>
 
-            </blockquote>
+                </itemizedlist>
+
+            </para>
             <para>
                 <itemizedlist>
                     <para>
@@ -410,35 +417,167 @@
         <section id="sect-Installation_Guide-Manual_Configuration-Webclient_Database_Configuration">
             <title>Webclient Database Configuration</title>
             <para>
-                The Webclient-Database needs a mysql server installation, which should have been installed as a dependency of the package. TODO: describe complete installation and setup of mysql db
+                The Webclient-Database needs a mysql server installation, which should have been installed as a dependency of the package.
             </para>
-            <para>
-                <filename>/path/to/file</filename>
-            </para>
-            <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
-                <title>title</title>
-
-<screen>var =    <replaceable>value</replaceable></screen>
+            <section id="sect-Installation_Guide-Webclient_Database_Configuration-Configuration_of_the_MySQL_server_for_the_Horde_Database">
+                <title>Configuration of the MySQL server for the Horde Database</title>
                 <para>
-                    blabla
+                    The following procedure ...
                 </para>
+                <procedure id="proc-Installation_Guide-Configuration_of_the_MySQL_server_for_the_Horde_Database-Configuring_the_Horde_Database">
+                    <title>Configuring the Horde Database</title>
+                    <step>
+                        <para>
+                            Configure the <application>mysqld</application> service to start on boot (runlevels 2 through 5):
+                        </para>
+                        <para>
+                            chkconfig mysqld on
+                        </para>
 
-            </blockquote>
-            <para>
-                <itemizedlist>
-                    <para>
-                        For detailed instructions for the manual setup please see:
-                    </para>
-                    <listitem>
+                    </step>
+                    <step>
                         <para>
-                            Webclient-Database
+                            Edit <filename>/etc/my.cnf</filename>, and execute the following edits:
                         </para>
+                        <para>
+                            <orderedlist>
+                                <listitem>
+                                    <para>
+                                        Set <code>old_passwords</code> to <code>0</code>.
+                                    </para>
 
-                    </listitem>
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        Make sure the InnoDB storage engine is enabled, by providing the MySQL server with the binary log settings:
+                                    </para>
+                                    <para>
 
-                </itemizedlist>
+<screen># Make sure all logs are flushed on shutdown
+innodb_fast_shutdown=0
+
+innodb_file_per_table
+innodb_data_file_path = ibdata1:128M:autoextend</screen>
+
+                                    </para>
+                                    <note>
+                                        <title>The Size Values are Defaults</title>
+                                        <para>
+                                            Adjust the default size values as shown in this step of the procedure to your needs as appropriate.
+                                        </para>
+
+                                    </note>
+
+                                </listitem>
+
+                            </orderedlist>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Start the MySQL server for the first time:
+                        </para>
+                        <para>
+
+<screen># <userinput>service mysqld start</userinput>
+
+Initializing MySQL database:  Installing MySQL system tables...
+OK
+Filling help tables...
+OK
+
+To start mysqld at boot time you have to copy
+support-files/mysql.server to the right place for your system
+
+PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !
+To do so, start the server, then issue the following commands:
+/usr/bin/mysqladmin -u root password 'new-password'
+/usr/bin/mysqladmin -u root -h test90-2.test90.kolabsys.com password 'new-password'
+
+Alternatively you can run:
+/usr/bin/mysql_secure_installation
+
+which will also give you the option of removing the test
+databases and anonymous user created by default.  This is
+strongly recommended for production servers.
+
+See the manual for more instructions.
+
+You can start the MySQL daemon with:
+cd /usr ; /usr/bin/mysqld_safe &
+
+You can test the MySQL daemon with mysql-test-run.pl
+cd mysql-test ; perl mysql-test-run.pl
+
+Please report any problems with the /usr/bin/mysqlbug script!
+
+The latest information about MySQL is available on the web at
+http://www.mysql.com
+Support MySQL by buying support/licenses at http://shop.mysql.com
+                                                        [  OK  ]
+Starting MySQL:                                            [  OK  ]
+</screen>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Run the initial configuration and securing, and follow the instructions:
+                        </para>
+                        <para>
+
+<screen># <userinput>/usr/bin/mysql_secure_installation</userinput></screen>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Create the horde database:
+                        </para>
+                        <para>
+
+<screen># <userinput>mysql -p -e 'CREATE DATABASE horde;'</userinput></screen>
+
+                        </para>
+
+                    </step>
+                    <step>
+                        <para>
+                            Create the horde user and grant all privileges to the horde database to that horde user:
+                        </para>
+                        <para>
+
+<screen># <userinput>mysql -p -e 'GRANT ALL PRIVILEGES on `horde`.* TO</userinput>
+   <userinput>`horde`@`localhost` IDENTIFIED BY "YourPassword";'</userinput></screen>
+
+                        </para>
+
+                    </step>
+
+                </procedure>
+
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Horde-Webclient-Database
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
+
+                </para>
+
+            </section>
 
-            </para>
 
         </section>
 
diff --git a/Installation_Guide/en-US/Kolab_Server_Overview.xml b/Installation_Guide/en-US/Kolab_Server_Overview.xml
index b8ef90c..2c7b385 100755
--- a/Installation_Guide/en-US/Kolab_Server_Overview.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Overview.xml
@@ -16,7 +16,7 @@
             <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
                 <title>Kolab-IMAP</title>
                 <para>
-                    The IMAP server component including a deamon which handles the ldap authentication.
+                    The IMAP server component including a deamon which handles the ldap authentication (kolabd).
                 </para>
 
             </formalpara>
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
index bd23417..332b2c9 100755
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -8,7 +8,6 @@
     <xi:include href="Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Kolab_Webclient_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Bootstrapping_the_Kolab_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <!--
     <xi:include href="Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />


commit ecc069cfcd1bb37e28911b22f54b0fe511501942
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 18:32:35 2011 +0200

    -Remove unnecessary stuff, the meta packages don't have distribution specific names, various things

diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
index b793036..6927b35 100755
--- a/Installation_Guide/en-US/Kolab_Server_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -31,219 +31,152 @@
     <section id="sect-Installation_Guide-Configuration-Manual_Configuration">
         <title>Manual Configuration</title>
         <para>
-            If you cannot use the pykolab utility for some reason, all configurations can also be made manually.
+            If you cannot use the pykolab utility for some reason, all configurations can also be made manually. In the following the minimum amount of configuration needed to get a fully working single server installation is described. This will give you the same result as using the pykolab utility.
         </para>
-
-    </section>
-
-    <section id="sect-Installation_Guide-Configuration-LDAP_Configuration">
-        <title>LDAP Configuration</title>
-        <para>
-            To configure the LDAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
-
-        </para>
-        <para>
-            If you ran the script successfully you can move on to the next component.
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/etc/openldap/slapd.conf</filename>
-        </para>
-        <para>
-            Update all example.org <emphasis>distinguished name</emphasis>.
-        </para>
-        <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
-            <title>certificates</title>
+        <section id="sect-Installation_Guide-Manual_Configuration-LDAP_Configuration">
+            <title>LDAP Configuration</title>
+            <para>
+                <filename>/etc/openldap/slapd.conf</filename>
+            </para>
+            <para>
+                Update all example.org <emphasis>distinguished name</emphasis>.
+            </para>
+            <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
+                <title>certificates</title>
 
 <screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/host.example.org.crt</replaceable></screen>
 
 <screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/host.example.org.key</replaceable></screen>
-            <para>
+                <para>
 
-            </para>
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-LDAP_Configuration-rootDSE">
-            <title>rootDSE</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-LDAP_Configuration-rootDSE">
+                <title>rootDSE</title>
 
 <screen>rootDSE <replaceable>/path/to/rootDSE.ldif</replaceable></screen>
-            <para>
-                Specify the name of an LDIF(5) file containing user defined attributes for the root DSE. These attributes are returned in addition to the attributes normally produced by slapd.
-            </para>
-
-        </blockquote>
-        <para>
-            <itemizedlist>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    Specify the name of an LDIF(5) file containing user defined attributes for the root DSE. These attributes are returned in addition to the attributes normally produced by slapd.
                 </para>
-                <listitem>
+
+            </blockquote>
+            <para>
+                <itemizedlist>
                     <para>
-                        OpenLDAP
+                        For detailed instructions for the manual setup please see:
                     </para>
+                    <listitem>
+                        <para>
+                            OpenLDAP
+                        </para>
 
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
+                    </listitem>
 
-    </section>
+                </itemizedlist>
 
-    <section id="sect-Installation_Guide-Configuration-Cyrus_IMAP_Configuration_default">
-        <title>Cyrus-IMAP Configuration (default)</title>
-        <para>
-            To configure the IMAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
+            </para>
 
-        </para>
-        <para>
-            If you ran the script successfully you can move on to the next component.
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/etc/imapd.conf</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-servername">
-            <title>servername</title>
+        </section>
 
-<screen>servername:   <replaceable>example.org</replaceable></screen>
+        <section id="sect-Installation_Guide-Manual_Configuration-Cyrus_IMAP_Configuration_default">
+            <title>Cyrus-IMAP Configuration (default)</title>
             <para>
-                This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
+                <filename>/etc/imapd.conf</filename>
             </para>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-servername">
+                <title>servername</title>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-admin">
-            <title>admin</title>
+<screen>servername:   <replaceable>example.org</replaceable></screen>
+                <para>
+                    This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
+                </para>
+
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-admin">
+                <title>admin</title>
 
 <screen>admin: <replaceable>user1 user2</replaceable></screen>
-            <para>
-                The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
-            </para>
-            <para>
-                Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
-            </para>
+                <para>
+                    The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
+                </para>
+                <para>
+                    Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_base">
-            <title>ldap_base</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_base">
+                <title>ldap_base</title>
 
 <screen>ldap_base:    <replaceable>dc=example,dc=org</replaceable></screen>
-            <para>
-                Contains the LDAP base dn for the LDAP ptloader module
-            </para>
+                <para>
+                    Contains the LDAP base dn for the LDAP ptloader module
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_bind_dn">
-            <title>ldap_bind_dn</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_bind_dn">
+                <title>ldap_bind_dn</title>
 
 <screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=example,dc=org</replaceable></screen>
-            <para>
-                Bind DN for the connection to the LDAP server (simple bind). Do not use for anonymous simple binds
-            </para>
+                <para>
+                    Bind DN for the connection to the LDAP server (simple bind). Do not use for anonymous simple binds
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_password">
-            <title>ldap_password</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_password">
+                <title>ldap_password</title>
 
 <screen>ldap_password:    <replaceable>LDAPpassword</replaceable></screen>
-            <para>
-                Password for the LDAP server.
-            </para>
+                <para>
+                    Password for the LDAP server.
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_group_base">
-            <title>ldap_group_base</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_group_base">
+                <title>ldap_group_base</title>
 
 <screen>ldap_group_base:    <replaceable>ou=Groups,dc=example,dc=org</replaceable></screen>
-            <para>
-                LDAP base dn for ldap_group_filter.
-            </para>
+                <para>
+                    LDAP base dn for ldap_group_filter.
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_member_base">
-            <title>ldap_member_base</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_member_base">
+                <title>ldap_member_base</title>
 
 <screen>ldap_member_base:    <replaceable>ou=People,dc=example,dc=org</replaceable></screen>
-            <para>
-                LDAP base dn for ldap_member_filter.
-            </para>
+                <para>
+                    LDAP base dn for ldap_member_filter.
+                </para>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-tls_cert">
-            <title>tls-cert</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-tls_cert">
+                <title>tls-cert</title>
 
 <screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
-            <para>
-                File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
-                <note>
-                    <title>TLS Certifiactes</title>
-                    <para>
-                        TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
-                    </para>
+                <para>
+                    File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
+                    <note>
+                        <title>TLS Certifiactes</title>
+                        <para>
+                            TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                        </para>
 
-                </note>
+                    </note>
 
-            </para>
+                </para>
 
 <screen>tls_key_file:    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
-            <para>
-                File containing the private key belonging to the server certificate. A value of "disabled" will disable SSL/TLS.
-            </para>
+                <para>
+                    File containing the private key belonging to the server certificate. A value of "disabled" will disable SSL/TLS.
+                </para>
 
 <screen>tls_ca_file:    <replaceable>/etc/pki/tls/certs/host.example.org_ca.crt</replaceable></screen>
-            <para>
-                File containing one or more Certificate Authority (CA) certificates.
-            </para>
-
-        </blockquote>
-        <para>
-            <itemizedlist>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    File containing one or more Certificate Authority (CA) certificates.
                 </para>
-                <listitem>
-                    <para>
-                        Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
-
-    </section>
-
-    <section id="sect-Installation_Guide-Configuration-Dovecot_IMAP_Configuration_Alternative">
-        <title>Dovecot-IMAP Configuration (Alternative)</title>
-        <para>
-            To configure the IMAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
-
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/etc/dovecot.conf</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-Dovecot_IMAP_Configuration_Alternative-TODO_placeholder">
-            <title>TODO placeholder</title>
-
-<screen>placeholder <replaceable>replacable</replaceable></screen>
-            <para>
-                Comment.
-            </para>
 
-        </blockquote>
-        <note>
-            <title>Detailed Instructions</title>
+            </blockquote>
             <para>
                 <itemizedlist>
                     <para>
@@ -251,7 +184,7 @@
                     </para>
                     <listitem>
                         <para>
-                            Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                            Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
                         </para>
 
                     </listitem>
@@ -260,49 +193,72 @@
 
             </para>
 
-        </note>
+        </section>
 
-    </section>
+        <section id="sect-Installation_Guide-Manual_Configuration-Dovecot_IMAP_Configuration_Alternative">
+            <title>Dovecot-IMAP Configuration (Alternative)</title>
+            <para>
+                <filename>/etc/dovecot.conf</filename>
+            </para>
+            <blockquote id="bloc-Installation_Guide-Dovecot_IMAP_Configuration_Alternative-TODO_placeholder">
+                <title>TODO placeholder</title>
 
-    <section id="sect-Installation_Guide-Configuration-MTA_Configuration">
-        <title>MTA Configuration</title>
-        <para>
-            To configure the MTA component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
+<screen>placeholder <replaceable>replacable</replaceable></screen>
+                <para>
+                    Comment.
+                </para>
 
-        </para>
-        <para>
-            If you ran the script successfully you can move on to the next component.
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/etc/postfix/main.cf</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
-            <title>tls-cert</title>
+            </blockquote>
+            <note>
+                <title>Detailed Instructions</title>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                            </para>
 
-<screen>smtpd_tls_cert_file =    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
+                        </listitem>
+
+                    </itemizedlist>
+
+                </para>
+
+            </note>
+
+        </section>
+
+        <section id="sect-Installation_Guide-Manual_Configuration-MTA_Configuration">
+            <title>MTA Configuration</title>
             <para>
-                File with the Postfix SMTP server RSA certificate in PEM format. This file may also contain the Postfix SMTP server private RSA key.
+                <filename>/etc/postfix/main.cf</filename>
             </para>
+            <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
+                <title>tls-cert</title>
+
+<screen>smtpd_tls_cert_file =    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
+                <para>
+                    File with the Postfix SMTP server RSA certificate in PEM format. This file may also contain the Postfix SMTP server private RSA key.
+                </para>
 
 <screen>smtpd_tls_key_file =    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
-            <para>
-                File with the Postfix SMTP server RSA private key in PEM format. This file may be combined with the Postfix SMTP server RSA certificate file specified with $smtpd_tls_cert_file. The private key must be accessible without a pass-phrase, i.e. it must not be encrypted. File permissions should grant read-only access to the system superuser account ("root"), and no access to anyone else.
-            </para>
+                <para>
+                    File with the Postfix SMTP server RSA private key in PEM format. This file may be combined with the Postfix SMTP server RSA certificate file specified with $smtpd_tls_cert_file. The private key must be accessible without a pass-phrase, i.e. it must not be encrypted. File permissions should grant read-only access to the system superuser account ("root"), and no access to anyone else.
+                </para>
 
-        </blockquote>
-        <warning>
-            <title>SASL related configurations</title>
-            <para>
-                Depending on the used IMAP server the SASL related configs must be replaced. See <ulink url="http://www.postfix.org/SASL_README.html#server_sasl">Postfix SASL documentation</ulink> for more info.
-            </para>
+            </blockquote>
+            <warning>
+                <title>SASL related configurations</title>
+                <para>
+                    Depending on the used IMAP server the SASL related configs must be replaced. See <ulink url="http://www.postfix.org/SASL_README.html#server_sasl">Postfix SASL documentation</ulink> for more info.
+                </para>
 
-        </warning>
-        <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Cyrus_IMAP">
-            <title>SASL with Cyrus-IMAP</title>
+            </warning>
+            <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Cyrus_IMAP">
+                <title>SASL with Cyrus-IMAP</title>
 
 <screen>cyrus_sasl_config_path =    <replaceable>/etc/sasl2/</replaceable></screen>
 
@@ -310,206 +266,182 @@
 
 <screen>smtpd_sasl_type =    <replaceable>cyrus</replaceable></screen>
 
-        </blockquote>
-        <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Dovecot_IMAP">
-            <title>SASL with Dovecot-IMAP</title>
+            </blockquote>
+            <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Dovecot_IMAP">
+                <title>SASL with Dovecot-IMAP</title>
 
 <screen>smtpd_sasl_path =    <replaceable>private/auth</replaceable></screen>
 
 <screen>smtpd_sasl_type =    <replaceable>dovecot</replaceable></screen>
 
-        </blockquote>
-        <note>
-            <title>Manpage</title>
+            </blockquote>
+            <note>
+                <title>Manpage</title>
+                <para>
+                    For further info see <command>man 5 postconf</command>
+                </para>
+
+            </note>
             <para>
-                For further info see <command>man 5 postconf</command>
+                <filename>/etc/postfix/master.cf</filename>
             </para>
-
-        </note>
-        <para>
-            <filename>/etc/postfix/master.cf</filename>
-        </para>
-        <para>
-            TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
-        </para>
-        <para>
-            <filename>/etc/postfix/ldap/mydestination.cf</filename>
-        </para>
-        <para>
-            What is it good for?
-        </para>
-        <para>
-            <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
-        </para>
-        <para>
-            What is it good for?
-        </para>
-        <para>
-            <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
-        </para>
-        <para>
-            What is it good for?
-        </para>
-        <para>
-            <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
-        </para>
-        <para>
-            What is it good for?
-        </para>
-        <para>
-            <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
-        </para>
-        <para>
-            What is it good for?
-        </para>
-        <important>
-            <title>Adjust example.org domain names</title>
             <para>
-                Adjust the example.org rootDNs and domain names in all these files.
+                TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
             </para>
-
-        </important>
-        <para>
-            <itemizedlist>
+            <para>
+                <filename>/etc/postfix/ldap/mydestination.cf</filename>
+            </para>
+            <para>
+                What is it good for?
+            </para>
+            <para>
+                <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
+            </para>
+            <para>
+                What is it good for?
+            </para>
+            <para>
+                <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
+            </para>
+            <para>
+                What is it good for?
+            </para>
+            <para>
+                <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
+            </para>
+            <para>
+                What is it good for?
+            </para>
+            <para>
+                <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
+            </para>
+            <para>
+                What is it good for?
+            </para>
+            <important>
+                <title>Adjust example.org domain names</title>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    Adjust the example.org rootDNs and domain names in all these files.
                 </para>
-                <listitem>
+
+            </important>
+            <para>
+                <itemizedlist>
                     <para>
-                        MTA
+                        For detailed instructions for the manual setup please see:
                     </para>
+                    <listitem>
+                        <para>
+                            MTA
+                        </para>
 
-                </listitem>
-
-            </itemizedlist>
+                    </listitem>
 
-        </para>
+                </itemizedlist>
 
-    </section>
+            </para>
 
-    <section id="sect-Installation_Guide-Configuration-Kolab_Webadmin_Configuration">
-        <title>Kolab-Webadmin Configuration</title>
-        <para>
-            To configure the Webadmin interface, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
+        </section>
 
-        </para>
-        <para>
-            If you ran the script successfully you can move on to the next component.
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/path/to/file</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-Kolab_Webadmin_Configuration-title">
-            <title>title</title>
-
-<screen>var =    <replaceable>value</replaceable></screen>
+        <section id="sect-Installation_Guide-Manual_Configuration-Kolab_Webadmin_Configuration">
+            <title>Kolab-Webadmin Configuration</title>
             <para>
-                blabla
+                <filename>/path/to/file</filename>
             </para>
+            <blockquote id="bloc-Installation_Guide-Kolab_Webadmin_Configuration-title">
+                <title>title</title>
 
-        </blockquote>
-        <para>
-            <itemizedlist>
+<screen>var =    <replaceable>value</replaceable></screen>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    blabla
                 </para>
-                <listitem>
+
+            </blockquote>
+            <para>
+                <itemizedlist>
                     <para>
-                        Webadmin
+                        For detailed instructions for the manual setup please see:
                     </para>
+                    <listitem>
+                        <para>
+                            Webadmin
+                        </para>
 
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
+                    </listitem>
 
-    </section>
+                </itemizedlist>
 
-    <section id="sect-Installation_Guide-Configuration-Webclient_Configuration">
-        <title>Webclient Configuration</title>
-        <para>
-            To configure the Webclient component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
+            </para>
 
-        </para>
-        <para>
-            If you ran the script successfully you can move on to the next component.
-        </para>
-        <para>
-            Alternatively you may manually configure the following set of minimum values:
-        </para>
-        <para>
-            <filename>/path/to/file</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
-            <title>title</title>
+        </section>
 
-<screen>var =    <replaceable>value</replaceable></screen>
+        <section id="sect-Installation_Guide-Manual_Configuration-Webclient_Configuration">
+            <title>Webclient Configuration</title>
             <para>
-                blabla
+                <filename>/path/to/file</filename>
             </para>
+            <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
+                <title>title</title>
 
-        </blockquote>
-        <para>
-            <itemizedlist>
+<screen>var =    <replaceable>value</replaceable></screen>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    blabla
                 </para>
-                <listitem>
+
+            </blockquote>
+            <para>
+                <itemizedlist>
                     <para>
-                        Webclient
+                        For detailed instructions for the manual setup please see:
                     </para>
+                    <listitem>
+                        <para>
+                            Webclient
+                        </para>
 
-                </listitem>
-
-            </itemizedlist>
-
-        </para>
+                    </listitem>
 
-    </section>
+                </itemizedlist>
 
-    <section id="sect-Installation_Guide-Configuration-Webclient_Database_Configuration">
-        <title>Webclient Database Configuration</title>
-        <para>
-            To configure the webclient-database component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
+            </para>
 
-        </para>
-        <para>
-            The Webclient-Database needs a mysql server installation, which should have been installed as a dependency of the package.
-        </para>
-        <para>
-            <filename>/path/to/file</filename>
-        </para>
-        <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
-            <title>title</title>
+        </section>
 
-<screen>var =    <replaceable>value</replaceable></screen>
+        <section id="sect-Installation_Guide-Manual_Configuration-Webclient_Database_Configuration">
+            <title>Webclient Database Configuration</title>
+            <para>
+                The Webclient-Database needs a mysql server installation, which should have been installed as a dependency of the package. TODO: describe complete installation and setup of mysql db
+            </para>
             <para>
-                blabla
+                <filename>/path/to/file</filename>
             </para>
+            <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
+                <title>title</title>
 
-        </blockquote>
-        <para>
-            <itemizedlist>
+<screen>var =    <replaceable>value</replaceable></screen>
                 <para>
-                    For detailed instructions for the manual setup please see:
+                    blabla
                 </para>
-                <listitem>
+
+            </blockquote>
+            <para>
+                <itemizedlist>
                     <para>
-                        Webclient-Database
+                        For detailed instructions for the manual setup please see:
                     </para>
+                    <listitem>
+                        <para>
+                            Webclient-Database
+                        </para>
 
-                </listitem>
+                    </listitem>
 
-            </itemizedlist>
+                </itemizedlist>
+
+            </para>
+
+        </section>
 
-        </para>
 
     </section>
 
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 464bb80..e8f9028 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -499,15 +499,10 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
         <para>
             If you want a default installation of a components on a single server, pleas run:
 <screen># <userinput>yum install kolab-groupware-server</userinput></screen>
-            This will install all needed components.
+            This meta-package will install all needed components.
         </para>
         <para>
-            Once the installation is complete, you can configure all components using:
-<screen># <userinput>/opt/kolab/bin/kolab-setup</userinput></screen>
-
-        </para>
-        <para>
-            If you ran the script successfully the installation and configuration of the server is complete and you can move on to the next chapter.
+            Once the installation is complete, you can continue with the configuration in the next chapter.
         </para>
         <para>
             Alternatively you can install each component individually, which will give you the same result.
@@ -521,6 +516,9 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
             The following packages are available to install the individual components. Please use your distributions package management system to install them.
         </para>
         <para>
+            The <emphasis>default meta-package</emphasis> will install the default component. The <emphasis>alternative package</emphasis> is an alternative to the default component. <emphasis>Optional packages</emphasis> provide extra functionality which is not needed for a standard installation.
+        </para>
+        <para>
             <table frame="all" id="tabl-Installation_Guide-Packagelist-Packages">
                 <title>Packages</title>
                 <tgroup align="left" cols="5" colsep="1" rowsep="1">
@@ -528,11 +526,15 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     <colspec colname="c2"></colspec>
                     <colspec colname="c3"></colspec>
                     <colspec colname="c4"></colspec>
+                    <colspec colname="c5" colnum="5"></colspec>
                     <thead>
                         <row>
-                            <entry>
+                            <entry align="center" nameend="c4" namest="c1">
                                 Package List
                             </entry>
+                            <entry morerows="1">
+                                Package Description
+                            </entry>
 
                         </row>
                         <row>
@@ -540,39 +542,37 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                                 Package
                             </entry>
                             <entry>
-                                CentOS
+                                default meta-package
                             </entry>
                             <entry>
-                                Debian
+                                alternative package
                             </entry>
                             <entry>
-                                Fedora
+                                optional packages
                             </entry>
 
                         </row>
 
                     </thead>
-                    <!--
-                    <tfoot> <row>
-                        <entry>
-                            f1
-                        </entry>
-                        <entry>
-                            f2
-                        </entry>
-                        <entry>
-                            f3
-                        </entry>
-                        <entry>
-                            f4
-                        </entry>
-                        <entry>
-                            f5
-                        </entry>
+                    <tbody>
+                        <row>
+                            <entry>
+                                Complete Server
+                            </entry>
+                            <entry>
+                                kolab-groupware-server
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                A meta package to install all default components.
+                            </entry>
 
-                    </row>
-                    </tfoot>
-                    --> <tbody>
+                        </row>
                         <row>
                             <entry>
                                 LDAP
@@ -586,6 +586,9 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                             <entry>
                                 -
                             </entry>
+                            <entry>
+                                The LDAP component (openldap by default).
+                            </entry>
 
                         </row>
                         <row>
@@ -596,6 +599,81 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                                 kolab-imap
                             </entry>
                             <entry>
+                                kolab-imap-dovecot
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                The IMAP component (cyrus by default).
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                MTA
+                            </entry>
+                            <entry>
+                                kolab-mta
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                The MTA component (postfix by default).
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Webadmin
+                            </entry>
+                            <entry>
+                                kolab-webadmin
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Webclient-Database
+                            </entry>
+                            <entry>
+                                kolab-webclient-database
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+
+                        </row>
+                        <row>
+                            <entry>
+                                Webclient
+                            </entry>
+                            <entry>
+                                kolab-webclient
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
                                 -
                             </entry>
                             <entry>
@@ -611,6 +689,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
             </table>
 
         </para>
+
     </section>
 
 


commit 1eaf14886f4b626344b843554c76c133af2767a1
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 16:40:16 2011 +0200

    Restructuring
    
    -Split of the docs into 3 parts Overview, Installation, Configuration
     to minimize repeated sections and follow the visualized workflow of the pykolab utility more closely
    -The installation procedure is now just packaglist

diff --git a/Installation_Guide/en-US/Kolab_Server_Configuration.xml b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
new file mode 100755
index 0000000..b793036
--- /dev/null
+++ b/Installation_Guide/en-US/Kolab_Server_Configuration.xml
@@ -0,0 +1,518 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Installation_Guide-Configuration">
+    <title>Configuration</title>
+    <section id="sect-Installation_Guide-Configuration-Pykolab_setup_utility">
+        <title>Pykolab setup utility</title>
+        <para>
+            To setup each component the pykolab utilty can be used.
+        </para>
+        <para>
+            Once the installation is complete, you can configure all components using:
+<screen># <userinput>/opt/kolab/bin/kolab-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully the installation and configuration of the server is complete and you can move on to the next chapter.
+        </para>
+        <note>
+            <title> Mixing automated and manual configuration </title>
+            <para>
+                It is also possible to configure only certain components using the pykolab utility, and configurating others manually.
+            </para>
+
+        </note>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Manual_Configuration">
+        <title>Manual Configuration</title>
+        <para>
+            If you cannot use the pykolab utility for some reason, all configurations can also be made manually.
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-LDAP_Configuration">
+        <title>LDAP Configuration</title>
+        <para>
+            To configure the LDAP component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully you can move on to the next component.
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/etc/openldap/slapd.conf</filename>
+        </para>
+        <para>
+            Update all example.org <emphasis>distinguished name</emphasis>.
+        </para>
+        <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
+            <title>certificates</title>
+
+<screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/host.example.org.crt</replaceable></screen>
+
+<screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/host.example.org.key</replaceable></screen>
+            <para>
+
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-LDAP_Configuration-rootDSE">
+            <title>rootDSE</title>
+
+<screen>rootDSE <replaceable>/path/to/rootDSE.ldif</replaceable></screen>
+            <para>
+                Specify the name of an LDIF(5) file containing user defined attributes for the root DSE. These attributes are returned in addition to the attributes normally produced by slapd.
+            </para>
+
+        </blockquote>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        OpenLDAP
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Cyrus_IMAP_Configuration_default">
+        <title>Cyrus-IMAP Configuration (default)</title>
+        <para>
+            To configure the IMAP component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully you can move on to the next component.
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/etc/imapd.conf</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-servername">
+            <title>servername</title>
+
+<screen>servername:   <replaceable>example.org</replaceable></screen>
+            <para>
+                This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-admin">
+            <title>admin</title>
+
+<screen>admin: <replaceable>user1 user2</replaceable></screen>
+            <para>
+                The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
+            </para>
+            <para>
+                Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_base">
+            <title>ldap_base</title>
+
+<screen>ldap_base:    <replaceable>dc=example,dc=org</replaceable></screen>
+            <para>
+                Contains the LDAP base dn for the LDAP ptloader module
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_bind_dn">
+            <title>ldap_bind_dn</title>
+
+<screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=example,dc=org</replaceable></screen>
+            <para>
+                Bind DN for the connection to the LDAP server (simple bind). Do not use for anonymous simple binds
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_password">
+            <title>ldap_password</title>
+
+<screen>ldap_password:    <replaceable>LDAPpassword</replaceable></screen>
+            <para>
+                Password for the LDAP server.
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_group_base">
+            <title>ldap_group_base</title>
+
+<screen>ldap_group_base:    <replaceable>ou=Groups,dc=example,dc=org</replaceable></screen>
+            <para>
+                LDAP base dn for ldap_group_filter.
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-ldap_member_base">
+            <title>ldap_member_base</title>
+
+<screen>ldap_member_base:    <replaceable>ou=People,dc=example,dc=org</replaceable></screen>
+            <para>
+                LDAP base dn for ldap_member_filter.
+            </para>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-Cyrus_IMAP_Configuration_default-tls_cert">
+            <title>tls-cert</title>
+
+<screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
+            <para>
+                File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
+                <note>
+                    <title>TLS Certifiactes</title>
+                    <para>
+                        TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                    </para>
+
+                </note>
+
+            </para>
+
+<screen>tls_key_file:    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
+            <para>
+                File containing the private key belonging to the server certificate. A value of "disabled" will disable SSL/TLS.
+            </para>
+
+<screen>tls_ca_file:    <replaceable>/etc/pki/tls/certs/host.example.org_ca.crt</replaceable></screen>
+            <para>
+                File containing one or more Certificate Authority (CA) certificates.
+            </para>
+
+        </blockquote>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Dovecot_IMAP_Configuration_Alternative">
+        <title>Dovecot-IMAP Configuration (Alternative)</title>
+        <para>
+            To configure the IMAP component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
+
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/etc/dovecot.conf</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-Dovecot_IMAP_Configuration_Alternative-TODO_placeholder">
+            <title>TODO placeholder</title>
+
+<screen>placeholder <replaceable>replacable</replaceable></screen>
+            <para>
+                Comment.
+            </para>
+
+        </blockquote>
+        <note>
+            <title>Detailed Instructions</title>
+            <para>
+                <itemizedlist>
+                    <para>
+                        For detailed instructions for the manual setup please see:
+                    </para>
+                    <listitem>
+                        <para>
+                            Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </note>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-MTA_Configuration">
+        <title>MTA Configuration</title>
+        <para>
+            To configure the MTA component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully you can move on to the next component.
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/etc/postfix/main.cf</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
+            <title>tls-cert</title>
+
+<screen>smtpd_tls_cert_file =    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
+            <para>
+                File with the Postfix SMTP server RSA certificate in PEM format. This file may also contain the Postfix SMTP server private RSA key.
+            </para>
+
+<screen>smtpd_tls_key_file =    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
+            <para>
+                File with the Postfix SMTP server RSA private key in PEM format. This file may be combined with the Postfix SMTP server RSA certificate file specified with $smtpd_tls_cert_file. The private key must be accessible without a pass-phrase, i.e. it must not be encrypted. File permissions should grant read-only access to the system superuser account ("root"), and no access to anyone else.
+            </para>
+
+        </blockquote>
+        <warning>
+            <title>SASL related configurations</title>
+            <para>
+                Depending on the used IMAP server the SASL related configs must be replaced. See <ulink url="http://www.postfix.org/SASL_README.html#server_sasl">Postfix SASL documentation</ulink> for more info.
+            </para>
+
+        </warning>
+        <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Cyrus_IMAP">
+            <title>SASL with Cyrus-IMAP</title>
+
+<screen>cyrus_sasl_config_path =    <replaceable>/etc/sasl2/</replaceable></screen>
+
+<screen>smtpd_sasl_path =    <replaceable>smtpd</replaceable></screen>
+
+<screen>smtpd_sasl_type =    <replaceable>cyrus</replaceable></screen>
+
+        </blockquote>
+        <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Dovecot_IMAP">
+            <title>SASL with Dovecot-IMAP</title>
+
+<screen>smtpd_sasl_path =    <replaceable>private/auth</replaceable></screen>
+
+<screen>smtpd_sasl_type =    <replaceable>dovecot</replaceable></screen>
+
+        </blockquote>
+        <note>
+            <title>Manpage</title>
+            <para>
+                For further info see <command>man 5 postconf</command>
+            </para>
+
+        </note>
+        <para>
+            <filename>/etc/postfix/master.cf</filename>
+        </para>
+        <para>
+            TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
+        </para>
+        <para>
+            <filename>/etc/postfix/ldap/mydestination.cf</filename>
+        </para>
+        <para>
+            What is it good for?
+        </para>
+        <para>
+            <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
+        </para>
+        <para>
+            What is it good for?
+        </para>
+        <para>
+            <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
+        </para>
+        <para>
+            What is it good for?
+        </para>
+        <para>
+            <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
+        </para>
+        <para>
+            What is it good for?
+        </para>
+        <para>
+            <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
+        </para>
+        <para>
+            What is it good for?
+        </para>
+        <important>
+            <title>Adjust example.org domain names</title>
+            <para>
+                Adjust the example.org rootDNs and domain names in all these files.
+            </para>
+
+        </important>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        MTA
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Kolab_Webadmin_Configuration">
+        <title>Kolab-Webadmin Configuration</title>
+        <para>
+            To configure the Webadmin interface, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully you can move on to the next component.
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/path/to/file</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-Kolab_Webadmin_Configuration-title">
+            <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+            <para>
+                blabla
+            </para>
+
+        </blockquote>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        Webadmin
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Webclient_Configuration">
+        <title>Webclient Configuration</title>
+        <para>
+            To configure the Webclient component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
+
+        </para>
+        <para>
+            If you ran the script successfully you can move on to the next component.
+        </para>
+        <para>
+            Alternatively you may manually configure the following set of minimum values:
+        </para>
+        <para>
+            <filename>/path/to/file</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
+            <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+            <para>
+                blabla
+            </para>
+
+        </blockquote>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        Webclient
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Configuration-Webclient_Database_Configuration">
+        <title>Webclient Database Configuration</title>
+        <para>
+            To configure the webclient-database component, please run the provided configuration script:
+<screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
+
+        </para>
+        <para>
+            The Webclient-Database needs a mysql server installation, which should have been installed as a dependency of the package.
+        </para>
+        <para>
+            <filename>/path/to/file</filename>
+        </para>
+        <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
+            <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+            <para>
+                blabla
+            </para>
+
+        </blockquote>
+        <para>
+            <itemizedlist>
+                <para>
+                    For detailed instructions for the manual setup please see:
+                </para>
+                <listitem>
+                    <para>
+                        Webclient-Database
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+
+</chapter>
+
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index d4f6954..464bb80 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -3,258 +3,12 @@
 <!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
 %BOOK_ENTITIES;
 ]>
-<chapter id="chap-Installation_Guide-Kolab_Server">
-    <title>Kolab Server</title>
+<chapter id="chap-Installation_Guide-Installation">
+    <title>Installation</title>
     <para>
-        The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
+        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Installation-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Installation-Installation_with_RPM_Packages" /> for more information.
     </para>
-    <itemizedlist>
-        <para>
-            The Kolab server consist of the following 6 components, which can be distributed among several systems. Each of those components can be installed using the provided meta package.
-        </para>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
-                <title>Kolab-IMAP</title>
-                <para>
-                    The IMAP server component including a deamon which handles the ldap authentication.
-                </para>
-
-            </formalpara>
-            <para>
-                <itemizedlist>
-                    <para>
-                        default meta-package:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>kolab-imap</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-                <itemizedlist>
-                    <para>
-                        default packages:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>cyrus-imap</application>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <application>kolab-daemon</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-                <itemizedlist>
-                    <para>
-                        optional-packages:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>dovecot-imap</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </listitem>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_LDAP">
-                <title>Kolab-LDAP</title>
-                <para>
-                    The ldap component is used to for the authentication of users.
-                </para>
-
-            </formalpara>
-            <para>
-                <itemizedlist>
-                    <para>
-                        default meta-package:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>kolab-ldap</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-                <itemizedlist>
-                    <para>
-                        default packages:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>openldap-server</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </listitem>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_MTA">
-                <title>Kolab-MTA</title>
-                <para>
-                    The MTA including spamfilter
-                </para>
-
-            </formalpara>
-            <para>
-                <itemizedlist>
-                    <para>
-                        default meta-package:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>kolab-mta</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-                <itemizedlist>
-                    <para>
-                        default packages:
-                    </para>
-                    <listitem>
-                        <para>
-                            <application>postfix</application>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <application>clamav</application>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <application>amavis</application>
-                        </para>
-
-                    </listitem>
-                    <listitem>
-                        <para>
-                            <application>TODO kolab-postfix-filters?</application>
-                        </para>
-
-                    </listitem>
-
-                </itemizedlist>
-
-            </para>
-
-        </listitem>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webadmin">
-                <title>Kolab-Webadmin</title>
-                <para>
-                    An administrator webinterface.
-                </para>
-
-            </formalpara>
-            <itemizedlist>
-                <para>
-                    default meta-package:
-                </para>
-                <listitem>
-                    <para>
-                        <application>kolab-webadmin</application>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </listitem>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient">
-                <title>Kolab-Webclient</title>
-                <para>
-                    An email webinterface.
-                </para>
-
-            </formalpara>
-            <itemizedlist>
-                <para>
-                    default meta-package:
-                </para>
-                <listitem>
-                    <para>
-                        <application>kolab-webclient</application>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-            <itemizedlist>
-                <para>
-                    default packages:
-                </para>
-                <listitem>
-                    <para>
-                        <application>kolab-webclient-roundcube</application>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-            <itemizedlist>
-                <para>
-                    optional-packages:
-                </para>
-                <listitem>
-                    <para>
-                        <application>kolab-webclient-horde</application>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </listitem>
-        <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
-                <title>Kolab-Webclient-Database</title>
-                <para>
-                    A database for the Kolab-Webclient which stores the settings of the webclient and caches data from the imap server.
-                </para>
-
-            </formalpara>
-            <itemizedlist>
-                <para>
-                    default meta-package:
-                </para>
-                <listitem>
-                    <para>
-                        <application>kolab-webclient-database</application>
-                    </para>
-
-                </listitem>
-
-            </itemizedlist>
-
-        </listitem>
-
-    </itemizedlist>
-    <para>
-        The Kolab community provides APT and RPM packages for most commonly used Linux distributions. Please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
-    </para>
-    <section id="sect-Installation_Guide-Kolab_Server-Kolab_Server_Installation">
+    <section id="sect-Installation_Guide-Installation-Kolab_Server_Installation">
         <title>Kolab Server Installation</title>
         <para>
             To get a fully working Kolab installation all of the 6 components above need to be installed.
@@ -263,7 +17,7 @@
             The Kolab community provides APT and RPM packages for most commonly used Linux distributions. To get a fully working Kolab server on a single system, please install the “kolab-groupware” meta-package which will install all components, and run the setup script on a single machine.
         </para>
         <para>
-            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages" /> for more information.
+            If you have a distributed deployment or want non default components, please see <xref linkend="sect-Installation_Guide-Installation-Installation_with_APT_Packages" /> and <xref linkend="sect-Installation_Guide-Installation-Installation_with_RPM_Packages" /> for more information.
         </para>
         <para>
             For help with your deployment please refer to the “Deployment Guide”.
@@ -271,7 +25,7 @@
 
     </section>
 
-    <section id="sect-Installation_Guide-Kolab_Server-Installation_with_APT_Packages">
+    <section id="sect-Installation_Guide-Installation-Installation_with_APT_Packages">
         <title>Installation with APT Packages</title>
         <para>
             bblablablablabl
@@ -279,7 +33,7 @@
 
     </section>
 
-    <section id="sect-Installation_Guide-Kolab_Server-Installation_with_RPM_Packages">
+    <section id="sect-Installation_Guide-Installation-Installation_with_RPM_Packages">
         <title>Installation with RPM Packages</title>
         <para>
             RPM packages are being provided for the following Linux distributions and versions:
@@ -737,575 +491,126 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
         </section>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Full_default_installation_on_a_single_server">
-            <title>Full default installation on a single server</title>
-            <para>
-                If you want a default installation of a components on a single server, pleas run:
-<screen># <userinput>yum install kolab-groupware-server</userinput></screen>
-                This will install all needed components.
-            </para>
-            <para>
-                Once the installation is complete, you can configure all components using:
-<screen># <userinput>/opt/kolab/bin/kolab-setup</userinput></screen>
-
-            </para>
-            <para>
-                If you ran the script successfully the installation and configuration of the server is complete and you can move on to the next chapter.
-            </para>
-            <para>
-                Alternatively you can install each component individually, which will give you the same result.
-            </para>
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_LDAP">
-            <title>Installation of LDAP</title>
-            <para>
-                For a default installation with <application>OpenLDAP</application> use:
-<screen># <userinput>yum install kolab-ldap</userinput></screen>
-
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_LDAP-LDAP_Configuration">
-                <title>LDAP Configuration</title>
-                <para>
-                    To configure the LDAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
-
-                </para>
-                <para>
-                    If you ran the script successfully you can move on to the next component.
-                </para>
-                <para>
-                    Alternatively you may manually configure the following set of minimum values:
-                </para>
-                <para>
-                    <filename>/etc/openldap/slapd.conf</filename>
-                </para>
-                <para>
-                    Update all example.org <emphasis>distinguished name</emphasis>.
-                </para>
-                <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
-                    <title>certificates</title>
-
-<screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/host.example.org.crt</replaceable></screen>
-
-<screen>TLSCertificateKeyFile <replaceable>/etc/pki/tls/certs/host.example.org.key</replaceable></screen>
-                    <para>
-
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-LDAP_Configuration-rootDSE">
-                    <title>rootDSE</title>
-
-<screen>rootDSE <replaceable>/path/to/rootDSE.ldif</replaceable></screen>
-                    <para>
-                        Specify the name of an LDIF(5) file containing user defined attributes for the root DSE. These attributes are returned in addition to the attributes normally produced by slapd.
-                    </para>
-
-                </blockquote>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                OpenLDAP
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </section>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_IMAP">
-            <title>Installation of IMAP</title>
-            <para>
-                For a default installation with <application>Cyrus IMAP</application> use:
-<screen># <userinput>yum install kolab-imap</userinput></screen>
-
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_IMAP-IMAP_Configuration">
-                <title>IMAP Configuration</title>
-                <para>
-                    To configure the IMAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
-
-                </para>
-                <para>
-                    If you ran the script successfully you can move on to the next component.
-                </para>
-                <para>
-                    Alternatively you may manually configure the following set of minimum values:
-                </para>
-                <para>
-                    <filename>/etc/imapd.conf</filename>
-                </para>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-servername">
-                    <title>servername</title>
-
-<screen>servername:   <replaceable>example.org</replaceable></screen>
-                    <para>
-                        This is the hostname visible in the greeting messages of the POP, IMAP and LMTP daemons. If it is unset, then the result returned from gethostname(2) is used.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-admin">
-                    <title>admin</title>
-
-<screen>admin: <replaceable>user1 user2</replaceable></screen>
-                    <para>
-                        The list of userids with administrative rights. Separate each userid with a space. Sites using Kerberos authentication may use separate "admin" instances.
-                    </para>
-                    <para>
-                        Note that accounts used by users should not be administrators. Administrative accounts should not receive mail. That is, if user "jbRo" is a user reading mail, he should not also be in the admins line. Some problems may occur otherwise, most notably the ability of administrators to create top-level mailboxes visible to users, but not writable by users.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_base">
-                    <title>ldap_base</title>
-
-<screen>ldap_base:    <replaceable>dc=example,dc=org</replaceable></screen>
-                    <para>
-                        Contains the LDAP base dn for the LDAP ptloader module
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_bind_dn">
-                    <title>ldap_bind_dn</title>
-
-<screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=example,dc=org</replaceable></screen>
-                    <para>
-                        Bind DN for the connection to the LDAP server (simple bind). Do not use for anonymous simple binds
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_password">
-                    <title>ldap_password</title>
-
-<screen>ldap_password:    <replaceable>LDAPpassword</replaceable></screen>
-                    <para>
-                        Password for the LDAP server.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_group_base">
-                    <title>ldap_group_base</title>
-
-<screen>ldap_group_base:    <replaceable>ou=Groups,dc=example,dc=org</replaceable></screen>
-                    <para>
-                        LDAP base dn for ldap_group_filter.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_member_base">
-                    <title>ldap_member_base</title>
-
-<screen>ldap_member_base:    <replaceable>ou=People,dc=example,dc=org</replaceable></screen>
-                    <para>
-                        LDAP base dn for ldap_member_filter.
-                    </para>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-tls_cert">
-                    <title>tls-cert</title>
-
-<screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
-                    <para>
-                        File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
-                        <note>
-                            <title>TLS Certifiactes</title>
-                            <para>
-                                TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
-                            </para>
-
-                        </note>
-
-                    </para>
-
-<screen>tls_key_file:    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
-                    <para>
-                        File containing the private key belonging to the server certificate. A value of "disabled" will disable SSL/TLS.
-                    </para>
-
-<screen>tls_ca_file:    <replaceable>/etc/pki/tls/certs/host.example.org_ca.crt</replaceable></screen>
-                    <para>
-                        File containing one or more Certificate Authority (CA) certificates.
-                    </para>
-
-                </blockquote>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                Cyrus-IMAP <!--    xref linkend="sect-Installation_Guide-Cyrus-IMAP" /    -->
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </section>
-
-            <section id="sect-Installation_Guide-Installation_of_IMAP-Alternative_Installing_Kolab_with_Dovecot_IMAP">
-                <title>Alternative: Installing Kolab with Dovecot IMAP</title>
-                <para>
-                    Instead of the default cyrus-imap server, <application>Dovecot IMAP</application> can be used instead.
-                </para>
-                <para>
-                    To install the Dovecot-IMAP server use:
-<screen># <userinput>yum install dovecot-imap</userinput></screen>
-
-                </para>
-                <section id="sect-Installation_Guide-Alternative_Installing_Kolab_with_Dovecot_IMAP-IMAP_Configuration">
-                    <title>IMAP Configuration</title>
-                    <para>
-                        To configure the IMAP component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
-
-                    </para>
-                    <para>
-                        Alternatively you may manually configure the following set of minimum values:
-                    </para>
-                    <para>
-                        <filename>/etc/dovecot.conf</filename>
-                    </para>
-                    <blockquote id="bloc-Installation_Guide-IMAP_Configuration-TODO_placeholder">
-                        <title>TODO placeholder</title>
-
-<screen>placeholder <replaceable>replacable</replaceable></screen>
-                        <para>
-                            Comment.
-                        </para>
-
-                    </blockquote>
-                    <note>
-                        <title>Detailed Instructions</title>
-                        <para>
-                            <itemizedlist>
-                                <para>
-                                    For detailed instructions for the manual setup please see:
-                                </para>
-                                <listitem>
-                                    <para>
-                                        Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
-                                    </para>
-
-                                </listitem>
-
-                            </itemizedlist>
-
-                        </para>
-
-                    </note>
-
-                </section>
-
-
-            </section>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_MTA">
-            <title>Installation of the MTA</title>
-            <para>
-                For a default installation use:
-<screen># <userinput>yum install kolab-mta</userinput></screen>
-
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_the_MTA-MTA_Configuration">
-                <title>MTA Configuration</title>
-                <para>
-                    To configure the MTA component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
-
-                </para>
-                <para>
-                    If you ran the script successfully you can move on to the next component.
-                </para>
-                <para>
-                    Alternatively you may manually configure the following set of minimum values:
-                </para>
-                <para>
-                    <filename>/etc/postfix/main.cf</filename>
-                </para>
-                <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
-                    <title>tls-cert</title>
-
-<screen>smtpd_tls_cert_file =    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
-                    <para>
-                        File with the Postfix SMTP server RSA certificate in PEM format. This file may also contain the Postfix SMTP server private RSA key.
-                    </para>
-
-<screen>smtpd_tls_key_file =    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
-                    <para>
-                        File with the Postfix SMTP server RSA private key in PEM format. This file may be combined with the Postfix SMTP server RSA certificate file specified with $smtpd_tls_cert_file. The private key must be accessible without a pass-phrase, i.e. it must not be encrypted. File permissions should grant read-only access to the system superuser account ("root"), and no access to anyone else.
-                    </para>
-
-                </blockquote>
-                <warning>
-                    <title>SASL related configurations</title>
-                    <para>
-                        Depending on the used IMAP server the SASL related configs must be replaced. See <ulink url="http://www.postfix.org/SASL_README.html#server_sasl">Postfix SASL documentation</ulink> for more info.
-                    </para>
-
-                </warning>
-                <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Cyrus_IMAP">
-                    <title>SASL with Cyrus-IMAP</title>
-
-<screen>cyrus_sasl_config_path =    <replaceable>/etc/sasl2/</replaceable></screen>
-
-<screen>smtpd_sasl_path =    <replaceable>smtpd</replaceable></screen>
-
-<screen>smtpd_sasl_type =    <replaceable>cyrus</replaceable></screen>
-
-                </blockquote>
-                <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Dovecot_IMAP">
-                    <title>SASL with Dovecot-IMAP</title>
-
-<screen>smtpd_sasl_path =    <replaceable>private/auth</replaceable></screen>
-
-<screen>smtpd_sasl_type =    <replaceable>dovecot</replaceable></screen>
-
-                </blockquote>
-                <note>
-                    <title>Manpage</title>
-                    <para>
-                        For further info see <command>man 5 postconf</command>
-                    </para>
-
-                </note>
-                <para>
-                    <filename>/etc/postfix/master.cf</filename>
-                </para>
-                <para>
-                    TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
-                </para>
-                <para>
-                    <filename>/etc/postfix/ldap/mydestination.cf</filename>
-                </para>
-                <para>
-                    What is it good for?
-                </para>
-                <para>
-                    <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
-                </para>
-                <para>
-                    What is it good for?
-                </para>
-                <para>
-                    <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
-                </para>
-                <para>
-                    What is it good for?
-                </para>
-                <para>
-                    <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
-                </para>
-                <para>
-                    What is it good for?
-                </para>
-                <para>
-                    <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
-                </para>
-                <para>
-                    What is it good for?
-                </para>
-                <important>
-                    <title>Adjust example.org domain names</title>
-                    <para>
-                        Adjust the example.org rootDNs and domain names in all these files.
-                    </para>
-
-                </important>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                MTA
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </section>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_interface">
-            <title>Installation of the Kolab-Webadmin interface</title>
-            <para>
-                For a default installation use:
-<screen># <userinput>yum install kolab-webadmin</userinput></screen>
-
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_interface-Webadmin_Configuration">
-                <title>Webadmin Configuration</title>
-                <para>
-                    To configure the Webadmin interface, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
-
-                </para>
-                <para>
-                    If you ran the script successfully you can move on to the next component.
-                </para>
-                <para>
-                    Alternatively you may manually configure the following set of minimum values:
-                </para>
-                <para>
-                    <filename>/path/to/file</filename>
-                </para>
-                <blockquote id="bloc-Installation_Guide-Webadmin_Configuration-title">
-                    <title>title</title>
-
-<screen>var =    <replaceable>value</replaceable></screen>
-                    <para>
-                        blabla
-                    </para>
-
-                </blockquote>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                Webadmin
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </section>
-
-
-        </section>
-
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient">
-            <title>Installation of the Kolab-Webclient</title>
-            <para>
-                For a default installation use:
-<screen># <userinput>yum install kolab-webclient</userinput></screen>
-
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient-Webclient_Configuration">
-                <title>Webclient Configuration</title>
-                <para>
-                    To configure the Webclient component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
-
-                </para>
-                <para>
-                    If you ran the script successfully you can move on to the next component.
-                </para>
-                <para>
-                    Alternatively you may manually configure the following set of minimum values:
-                </para>
-                <para>
-                    <filename>/path/to/file</filename>
-                </para>
-                <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
-                    <title>title</title>
-
-<screen>var =    <replaceable>value</replaceable></screen>
-                    <para>
-                        blabla
-                    </para>
-
-                </blockquote>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                Webclient
-                            </para>
-
-                        </listitem>
-
-                    </itemizedlist>
-
-                </para>
-
-            </section>
 
+    </section>
 
-        </section>
+    <section id="sect-Installation_Guide-Installation-Full_default_installation_on_a_single_server">
+        <title>Full default installation on a single server</title>
+        <para>
+            If you want a default installation of a components on a single server, pleas run:
+<screen># <userinput>yum install kolab-groupware-server</userinput></screen>
+            This will install all needed components.
+        </para>
+        <para>
+            Once the installation is complete, you can configure all components using:
+<screen># <userinput>/opt/kolab/bin/kolab-setup</userinput></screen>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database">
-            <title>Installation of the Kolab-Webclient-Database</title>
-            <para>
-                For a default installation use:
-<screen># <userinput>yum install kolab-webclient-database</userinput></screen>
+        </para>
+        <para>
+            If you ran the script successfully the installation and configuration of the server is complete and you can move on to the next chapter.
+        </para>
+        <para>
+            Alternatively you can install each component individually, which will give you the same result.
+        </para>
 
-            </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database-Webclient_Database_Configuration">
-                <title>Webclient Database Configuration</title>
-                <para>
-                    To configure the webclient-database component, please run the provided configuration script:
-<screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
+    </section>
 
-                </para>
-                <para>
-                    <filename>/path/to/file</filename>
-                </para>
-                <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
-                    <title>title</title>
+    <section id="sect-Installation_Guide-Installation-Packagelist">
+        <title>Packagelist</title>
+        <para>
+            The following packages are available to install the individual components. Please use your distributions package management system to install them.
+        </para>
+        <para>
+            <table frame="all" id="tabl-Installation_Guide-Packagelist-Packages">
+                <title>Packages</title>
+                <tgroup align="left" cols="5" colsep="1" rowsep="1">
+                    <colspec colname="c1"></colspec>
+                    <colspec colname="c2"></colspec>
+                    <colspec colname="c3"></colspec>
+                    <colspec colname="c4"></colspec>
+                    <thead>
+                        <row>
+                            <entry>
+                                Package List
+                            </entry>
 
-<screen>var =    <replaceable>value</replaceable></screen>
-                    <para>
-                        blabla
-                    </para>
+                        </row>
+                        <row>
+                            <entry>
+                                Package
+                            </entry>
+                            <entry>
+                                CentOS
+                            </entry>
+                            <entry>
+                                Debian
+                            </entry>
+                            <entry>
+                                Fedora
+                            </entry>
 
-                </blockquote>
-                <para>
-                    <itemizedlist>
-                        <para>
-                            For detailed instructions for the manual setup please see:
-                        </para>
-                        <listitem>
-                            <para>
-                                Webclient-Database
-                            </para>
+                        </row>
 
-                        </listitem>
+                    </thead>
+                    <!--
+                    <tfoot> <row>
+                        <entry>
+                            f1
+                        </entry>
+                        <entry>
+                            f2
+                        </entry>
+                        <entry>
+                            f3
+                        </entry>
+                        <entry>
+                            f4
+                        </entry>
+                        <entry>
+                            f5
+                        </entry>
 
-                    </itemizedlist>
+                    </row>
+                    </tfoot>
+                    --> <tbody>
+                        <row>
+                            <entry>
+                                LDAP
+                            </entry>
+                            <entry>
+                                kolab-ldap
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
 
-                </para>
+                        </row>
+                        <row>
+                            <entry>
+                                IMAP
+                            </entry>
+                            <entry>
+                                kolab-imap
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
+                            <entry>
+                                -
+                            </entry>
 
-            </section>
+                        </row>
 
+                    </tbody>
 
-        </section>
+                </tgroup>
 
+            </table>
 
+        </para>
     </section>
 
 
diff --git a/Installation_Guide/en-US/Kolab_Server_Overview.xml b/Installation_Guide/en-US/Kolab_Server_Overview.xml
new file mode 100755
index 0000000..b8ef90c
--- /dev/null
+++ b/Installation_Guide/en-US/Kolab_Server_Overview.xml
@@ -0,0 +1,256 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Installation_Guide-Kolab_Server">
+    <title>Kolab Server</title>
+    <para>
+        The Kolab server is built out of the best available Free and Open Source software components, most if not all of which are available through the Linux distribution of your preference. However, such Linux distribution may not be as up-to-date as one might wish for the Kolab Groupware to provide the latest and greatest functionality, or may simply have a different update policy from what is typically acceptable for a Groupware environment.
+    </para>
+    <itemizedlist>
+        <para>
+            The Kolab server consist of the following 6 components, which can be distributed among several systems. Each of those components can be installed using the provided meta package.
+        </para>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_IMAP">
+                <title>Kolab-IMAP</title>
+                <para>
+                    The IMAP server component including a deamon which handles the ldap authentication.
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-imap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>cyrus-imap</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>kolab-daemon</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        optional-packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>dovecot-imap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_LDAP">
+                <title>Kolab-LDAP</title>
+                <para>
+                    The ldap component is used to for the authentication of users.
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-ldap</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>openldap-server</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_MTA">
+                <title>Kolab-MTA</title>
+                <para>
+                    The MTA including spamfilter
+                </para>
+
+            </formalpara>
+            <para>
+                <itemizedlist>
+                    <para>
+                        default meta-package:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>kolab-mta</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+                <itemizedlist>
+                    <para>
+                        default packages:
+                    </para>
+                    <listitem>
+                        <para>
+                            <application>postfix</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>clamav</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>amavis</application>
+                        </para>
+
+                    </listitem>
+                    <listitem>
+                        <para>
+                            <application>TODO kolab-postfix-filters?</application>
+                        </para>
+
+                    </listitem>
+
+                </itemizedlist>
+
+            </para>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webadmin">
+                <title>Kolab-Webadmin</title>
+                <para>
+                    An administrator webinterface.
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webadmin</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient">
+                <title>Kolab-Webclient</title>
+                <para>
+                    An email webinterface.
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+            <itemizedlist>
+                <para>
+                    default packages:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient-roundcube</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+            <itemizedlist>
+                <para>
+                    optional-packages:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient-horde</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+        <listitem>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
+                <title>Kolab-Webclient-Database</title>
+                <para>
+                    A database for the Kolab-Webclient which stores the settings of the webclient and caches data from the imap server.
+                </para>
+
+            </formalpara>
+            <itemizedlist>
+                <para>
+                    default meta-package:
+                </para>
+                <listitem>
+                    <para>
+                        <application>kolab-webclient-database</application>
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </listitem>
+
+    </itemizedlist>
+
+</chapter>
+
diff --git a/Installation_Guide/en-US/part-Kolab_Server.xml b/Installation_Guide/en-US/part-Kolab_Server.xml
old mode 100644
new mode 100755
index a7a471f..bd23417
--- a/Installation_Guide/en-US/part-Kolab_Server.xml
+++ b/Installation_Guide/en-US/part-Kolab_Server.xml
@@ -5,9 +5,11 @@
 ]>
 <part id="part-Installation_Guide-Kolab_Groupware_Server">
     <title>Kolab Groupware Server</title>
+    <xi:include href="Kolab_Server_Overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Server_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-    <xi:include href="Bootstrapping_the_Kolab_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Kolab_Server_Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Webclient_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Bootstrapping_the_Kolab_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <!--
     <xi:include href="Cyrus_IMAP.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     //    -->


commit 1a64a09ecfeacf499a6fdce1e5e6cef45f64db6b
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 15:45:07 2011 +0200

    updated bootstrapping, some small changes to installation

diff --git a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
index 1fb6467..5e73d23 100755
--- a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
+++ b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
@@ -135,6 +135,23 @@
                 </listitem>
 
             </orderedlist>
+            <note>
+                <title>Identifying blocked ports</title>
+                <para>
+                    If the process fails due to running services and also
+<screen># <userinput>/usr/sbin/kolabsrv rc all stop</userinput></screen>
+                    does not help, the ports can be checked using:
+<screen># <userinput>lsof -Pnl +M -i4</userinput></screen>
+                    on an IPv4 network and
+<screen># <userinput>lsof -Pnl +M -i6</userinput></screen>
+                    for iPv6. Alternatively
+<screen># <userinput>netstat -tulpn</userinput></screen>
+                    should give you the same info. Stop all services running on one of the aforementioned ports:
+<screen># <userinput>/etc/rc.d/init.d/sendmail stop</userinput></screen>
+
+                </para>
+
+            </note>
 
         </para>
 
@@ -153,17 +170,124 @@
         <para>
             Follow the directions in this process.
         </para>
+
+    </section>
+
+    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Manual_Bootstrap_process">
+        <title>Manual Bootstrap process</title>
         <para>
-            If the process fails due to running services and also "/usr/sbin/kolabsrv rc all stop" does not help, the ports can be checked using:
-<screen># <userinput>lsof -Pnl +M -i4</userinput></screen>
-            on an IPv4 network and
-<screen># <userinput>lsof -Pnl +M -i6</userinput></screen>
-            for iPv6. Alternatively
-<screen># <userinput>netstat -tulpn</userinput></screen>
-            should give you the same info. Stop all services running on one of the aforementioned ports:
-<screen># <userinput>/etc/rc.d/init.d/sendmail stop</userinput></screen>
+            Instead of using the kolab_bootstrap utility, the services can also be started manually
+        </para>
+        <warning>
+            <title>Ensure that ports are free</title>
+            <para>
+                Please ensure first that all aforementioned ports are free
+            </para>
 
+        </warning>
+        <para>
+            The following services need to be started in this order (the order is mandatory). If you did not use the default components (i.e. dovecot instead of cyrus), you will have to adjust the commands accordingly accordingly.
         </para>
+        <itemizedlist id="item-Installation_Guide-Manual_Bootstrap_process-Services_to_start">
+            <title>Services to start</title>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-LDAP">
+                    <title><code>LDAP</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/ldap start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-SASL">
+                    <title><code>SASL</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/saslauthd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Amavis">
+                    <title><code>Amavis</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/amavisd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Clamav">
+                    <title><code>Clamav</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/clamd.amavisd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-cyrus_IMAP">
+                    <title><code>cyrus-IMAP</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/cyrus-imapd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Postfix">
+                    <title><code>Postfix</code></title>
+                    <para>
+
+<screen># <userinput>/etc/rc.d/init.d/postfix start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-Kolabd">
+                    <title><code>Kolabd</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/kolabd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Installation_Guide-Services_to_start-HTTP_Server">
+                    <title><code>HTTP Server</code></title>
+                    <para>
+
+<screen># <userinput>/etc/init.d/httpd start</userinput></screen>
+
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+
+        </itemizedlist>
 
     </section>
 
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index c37df4b..d4f6954 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -782,7 +782,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     <filename>/etc/openldap/slapd.conf</filename>
                 </para>
                 <para>
-                    Update all example.org Distinguished Names.
+                    Update all example.org <emphasis>distinguished name</emphasis>.
                 </para>
                 <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
                     <title>certificates</title>
@@ -942,11 +942,6 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
                 </blockquote>
                 <para>
-                    TODO: move this to admin guide, on installation the service is not running yet After you have finished the configuration, plase restart the service using:
-<screen># <userinput>/etc/rc.d/init.d/cyrus-imapd restart</userinput></screen>
-
-                </para>
-                <para>
                     <itemizedlist>
                         <para>
                             For detailed instructions for the manual setup please see:
@@ -1157,17 +1152,17 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
         </section>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_component">
-            <title>Installation of the Kolab-Webadmin component</title>
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webadmin_interface">
+            <title>Installation of the Kolab-Webadmin interface</title>
             <para>
                 For a default installation use:
 <screen># <userinput>yum install kolab-webadmin</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Webadmin_Configuration">
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_interface-Webadmin_Configuration">
                 <title>Webadmin Configuration</title>
                 <para>
-                    To configure the Webadmin component, please run the provided configuration script:
+                    To configure the Webadmin interface, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
 
                 </para>
@@ -1210,14 +1205,14 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
         </section>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_component">
-            <title>Installation of the Kolab-Webclient component</title>
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient">
+            <title>Installation of the Kolab-Webclient</title>
             <para>
                 For a default installation use:
 <screen># <userinput>yum install kolab-webclient</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Webclient_Configuration">
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient-Webclient_Configuration">
                 <title>Webclient Configuration</title>
                 <para>
                     To configure the Webclient component, please run the provided configuration script:
@@ -1263,14 +1258,14 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 
         </section>
 
-        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database_component">
-            <title>Installation of the Kolab-Webclient-Database component</title>
+        <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_the_Kolab_Webclient_Database">
+            <title>Installation of the Kolab-Webclient-Database</title>
             <para>
                 For a default installation use:
 <screen># <userinput>yum install kolab-webclient-database</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Webclient_Database_Configuration">
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database-Webclient_Database_Configuration">
                 <title>Webclient Database Configuration</title>
                 <para>
                     To configure the webclient-database component, please run the provided configuration script:
@@ -1296,7 +1291,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                         </para>
                         <listitem>
                             <para>
-                                Cache
+                                Webclient-Database
                             </para>
 
                         </listitem>


commit 13ddcfa8570ef780c487e65152fa7e4ef7bfe534
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 13:10:00 2011 +0200

    Various updates to the server installation

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 92d8779..c37df4b 100755
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -105,10 +105,10 @@
 
         </listitem>
         <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_mta">
-                <title>Kolab-mta</title>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_MTA">
+                <title>Kolab-MTA</title>
                 <para>
-                    The mta including spam and
+                    The MTA including spamfilter
                 </para>
 
             </formalpara>
@@ -160,10 +160,10 @@
 
         </listitem>
         <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webadmin">
-                <title>Kolab-webadmin</title>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webadmin">
+                <title>Kolab-Webadmin</title>
                 <para>
-                    A administrator webinterface. default package: kolab-webadmin
+                    An administrator webinterface.
                 </para>
 
             </formalpara>
@@ -182,8 +182,8 @@
 
         </listitem>
         <listitem>
-            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_webclient">
-                <title>Kolab-webclient</title>
+            <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient">
+                <title>Kolab-Webclient</title>
                 <para>
                     An email webinterface.
                 </para>
@@ -231,7 +231,7 @@
             <formalpara id="form-Installation_Guide-Kolab_Server-Kolab_Webclient_Database">
                 <title>Kolab-Webclient-Database</title>
                 <para>
-                    A database for the Kolab-webclient which stores the settings of the webclient and caches data from the imap server.
+                    A database for the Kolab-Webclient which stores the settings of the webclient and caches data from the imap server.
                 </para>
 
             </formalpara>
@@ -241,7 +241,7 @@
                 </para>
                 <listitem>
                     <para>
-                        <application>kolab-weblclient-database</application>
+                        <application>kolab-webclient-database</application>
                     </para>
 
                 </listitem>
@@ -761,12 +761,12 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
         <section id="sect-Installation_Guide-Installation_with_RPM_Packages-Installation_of_LDAP">
             <title>Installation of LDAP</title>
             <para>
-                For a default installation with <application>OpenLDAP</application>use:
+                For a default installation with <application>OpenLDAP</application> use:
 <screen># <userinput>yum install kolab-ldap</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_LDAP-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_LDAP-LDAP_Configuration">
+                <title>LDAP Configuration</title>
                 <para>
                     To configure the LDAP component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/ldap-setup</userinput></screen>
@@ -784,7 +784,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 <para>
                     Update all example.org Distinguished Names.
                 </para>
-                <blockquote id="bloc-Installation_Guide-Configuration-certificates">
+                <blockquote id="bloc-Installation_Guide-LDAP_Configuration-certificates">
                     <title>certificates</title>
 
 <screen>TLSCertificateFile <replaceable>/etc/pki/tls/certs/host.example.org.crt</replaceable></screen>
@@ -795,7 +795,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-rootDSE">
+                <blockquote id="bloc-Installation_Guide-LDAP_Configuration-rootDSE">
                     <title>rootDSE</title>
 
 <screen>rootDSE <replaceable>/path/to/rootDSE.ldif</replaceable></screen>
@@ -832,8 +832,8 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install kolab-imap</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_IMAP-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_IMAP-IMAP_Configuration">
+                <title>IMAP Configuration</title>
                 <para>
                     To configure the IMAP component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
@@ -848,7 +848,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 <para>
                     <filename>/etc/imapd.conf</filename>
                 </para>
-                <blockquote id="bloc-Installation_Guide-Configuration-servername">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-servername">
                     <title>servername</title>
 
 <screen>servername:   <replaceable>example.org</replaceable></screen>
@@ -857,7 +857,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-admin">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-admin">
                     <title>admin</title>
 
 <screen>admin: <replaceable>user1 user2</replaceable></screen>
@@ -869,7 +869,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_base">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_base">
                     <title>ldap_base</title>
 
 <screen>ldap_base:    <replaceable>dc=example,dc=org</replaceable></screen>
@@ -878,7 +878,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_bind_dn">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_bind_dn">
                     <title>ldap_bind_dn</title>
 
 <screen>ldap_bind_dn:    <replaceable>cn=nobody,cn=internal,dc=example,dc=org</replaceable></screen>
@@ -887,7 +887,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_password">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_password">
                     <title>ldap_password</title>
 
 <screen>ldap_password:    <replaceable>LDAPpassword</replaceable></screen>
@@ -896,7 +896,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_group_base">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_group_base">
                     <title>ldap_group_base</title>
 
 <screen>ldap_group_base:    <replaceable>ou=Groups,dc=example,dc=org</replaceable></screen>
@@ -905,7 +905,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-ldap_member_base">
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-ldap_member_base">
                     <title>ldap_member_base</title>
 
 <screen>ldap_member_base:    <replaceable>ou=People,dc=example,dc=org</replaceable></screen>
@@ -914,12 +914,20 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </para>
 
                 </blockquote>
-                <blockquote id="bloc-Installation_Guide-Configuration-tls_cert">
-                    <title>tls_cert</title>
+                <blockquote id="bloc-Installation_Guide-IMAP_Configuration-tls_cert">
+                    <title>tls-cert</title>
 
 <screen>tls_cert_file:    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
                     <para>
-                        File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS. TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                        File containing the certificate presented for server authentication during STARTTLS. A value of "disabled" will disable SSL/TLS.
+                        <note>
+                            <title>TLS Certifiactes</title>
+                            <para>
+                                TODO: note on generating a ca and intermediate ca and server certificates, add to that note the multi-valued cn attribute for web servers that are tcp/ip load-balanced
+                            </para>
+
+                        </note>
+
                     </para>
 
 <screen>tls_key_file:    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
@@ -966,8 +974,8 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install dovecot-imap</userinput></screen>
 
                 </para>
-                <section id="sect-Installation_Guide-Alternative_Installing_Kolab_with_Dovecot_IMAP-Configuration">
-                    <title>Configuration</title>
+                <section id="sect-Installation_Guide-Alternative_Installing_Kolab_with_Dovecot_IMAP-IMAP_Configuration">
+                    <title>IMAP Configuration</title>
                     <para>
                         To configure the IMAP component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/imap-setup</userinput></screen>
@@ -979,8 +987,8 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     <para>
                         <filename>/etc/dovecot.conf</filename>
                     </para>
-                    <blockquote id="bloc-Installation_Guide-Configuration-placeholder">
-                        <title>placeholder</title>
+                    <blockquote id="bloc-Installation_Guide-IMAP_Configuration-TODO_placeholder">
+                        <title>TODO placeholder</title>
 
 <screen>placeholder <replaceable>replacable</replaceable></screen>
                         <para>
@@ -988,21 +996,25 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                         </para>
 
                     </blockquote>
-                    <para>
-                        <itemizedlist>
-                            <para>
-                                For detailed instructions for the manual setup please see:
-                            </para>
-                            <listitem>
+                    <note>
+                        <title>Detailed Instructions</title>
+                        <para>
+                            <itemizedlist>
                                 <para>
-                                    Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                                    For detailed instructions for the manual setup please see:
                                 </para>
+                                <listitem>
+                                    <para>
+                                        Dovecot-IMAP <!--    xref linkend="sect-Installation_Guide-Dovecot-IMAP" /    -->
+                                    </para>
 
-                            </listitem>
+                                </listitem>
 
-                        </itemizedlist>
+                            </itemizedlist>
 
-                    </para>
+                        </para>
+
+                    </note>
 
                 </section>
 
@@ -1019,8 +1031,8 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install kolab-mta</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_MTA-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_the_MTA-MTA_Configuration">
+                <title>MTA Configuration</title>
                 <para>
                     To configure the MTA component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/mta-setup</userinput></screen>
@@ -1033,12 +1045,98 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     Alternatively you may manually configure the following set of minimum values:
                 </para>
                 <para>
-                    <filename>/etc/postfix/main.cf</filename> <filename>/etc/postfix/master.cf</filename> //no configuration TODO /etc/kolab/kolabfilter.conf in master <filename>/etc/postfix/ldap/mydestination.cf</filename> <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename> <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename> <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename> <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
+                    <filename>/etc/postfix/main.cf</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-MTA_Configuration-tls_cert">
+                    <title>tls-cert</title>
+
+<screen>smtpd_tls_cert_file =    <replaceable>/etc/pki/tls/certs/host.example.org.cert</replaceable></screen>
+                    <para>
+                        File with the Postfix SMTP server RSA certificate in PEM format. This file may also contain the Postfix SMTP server private RSA key.
+                    </para>
+
+<screen>smtpd_tls_key_file =    <replaceable>/etc/pki/tls/private/host.example.org.key</replaceable></screen>
+                    <para>
+                        File with the Postfix SMTP server RSA private key in PEM format. This file may be combined with the Postfix SMTP server RSA certificate file specified with $smtpd_tls_cert_file. The private key must be accessible without a pass-phrase, i.e. it must not be encrypted. File permissions should grant read-only access to the system superuser account ("root"), and no access to anyone else.
+                    </para>
+
+                </blockquote>
+                <warning>
+                    <title>SASL related configurations</title>
+                    <para>
+                        Depending on the used IMAP server the SASL related configs must be replaced. See <ulink url="http://www.postfix.org/SASL_README.html#server_sasl">Postfix SASL documentation</ulink> for more info.
+                    </para>
+
+                </warning>
+                <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Cyrus_IMAP">
+                    <title>SASL with Cyrus-IMAP</title>
+
+<screen>cyrus_sasl_config_path =    <replaceable>/etc/sasl2/</replaceable></screen>
+
+<screen>smtpd_sasl_path =    <replaceable>smtpd</replaceable></screen>
+
+<screen>smtpd_sasl_type =    <replaceable>cyrus</replaceable></screen>
+
+                </blockquote>
+                <blockquote id="bloc-Installation_Guide-MTA_Configuration-SASL_with_Dovecot_IMAP">
+                    <title>SASL with Dovecot-IMAP</title>
+
+<screen>smtpd_sasl_path =    <replaceable>private/auth</replaceable></screen>
+
+<screen>smtpd_sasl_type =    <replaceable>dovecot</replaceable></screen>
+
+                </blockquote>
+                <note>
+                    <title>Manpage</title>
+                    <para>
+                        For further info see <command>man 5 postconf</command>
+                    </para>
+
+                </note>
+                <para>
+                    <filename>/etc/postfix/master.cf</filename>
+                </para>
+                <para>
+                    TODO: configure kolabfilter first? Adjust the path to the config file of /etc/kolab/kolabfilter.conf
+                </para>
+                <para>
+                    <filename>/etc/postfix/ldap/mydestination.cf</filename>
+                </para>
+                <para>
+                    What is it good for?
+                </para>
+                <para>
+                    <filename>/etc/postfix/ldap/local_recipient_maps.cf</filename>
+                </para>
+                <para>
+                    What is it good for?
+                </para>
+                <para>
+                    <filename>/etc/postfix/ldap/virtual_alias_maps.cf</filename>
                 </para>
                 <para>
-                    Adjust the example.org rootDNs and domain names in these files.
+                    What is it good for?
                 </para>
                 <para>
+                    <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_distgroups.cf</filename>
+                </para>
+                <para>
+                    What is it good for?
+                </para>
+                <para>
+                    <filename>/etc/postfix/ldap/virtual_alias_maps_mailenabled_dynamic_distgroups.cf</filename>
+                </para>
+                <para>
+                    What is it good for?
+                </para>
+                <important>
+                    <title>Adjust example.org domain names</title>
+                    <para>
+                        Adjust the example.org rootDNs and domain names in all these files.
+                    </para>
+
+                </important>
+                <para>
                     <itemizedlist>
                         <para>
                             For detailed instructions for the manual setup please see:
@@ -1066,13 +1164,46 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install kolab-webadmin</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webadmin_component-Webadmin_Configuration">
+                <title>Webadmin Configuration</title>
                 <para>
                     To configure the Webadmin component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webadmin-setup</userinput></screen>
 
                 </para>
+                <para>
+                    If you ran the script successfully you can move on to the next component.
+                </para>
+                <para>
+                    Alternatively you may manually configure the following set of minimum values:
+                </para>
+                <para>
+                    <filename>/path/to/file</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-Webadmin_Configuration-title">
+                    <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+                    <para>
+                        blabla
+                    </para>
+
+                </blockquote>
+                <para>
+                    <itemizedlist>
+                        <para>
+                            For detailed instructions for the manual setup please see:
+                        </para>
+                        <listitem>
+                            <para>
+                                Webadmin
+                            </para>
+
+                        </listitem>
+
+                    </itemizedlist>
+
+                </para>
 
             </section>
 
@@ -1086,14 +1217,32 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install kolab-webclient</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_component-Webclient_Configuration">
+                <title>Webclient Configuration</title>
                 <para>
                     To configure the Webclient component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webclient-setup</userinput></screen>
 
                 </para>
                 <para>
+                    If you ran the script successfully you can move on to the next component.
+                </para>
+                <para>
+                    Alternatively you may manually configure the following set of minimum values:
+                </para>
+                <para>
+                    <filename>/path/to/file</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-Webclient_Configuration-title">
+                    <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+                    <para>
+                        blabla
+                    </para>
+
+                </blockquote>
+                <para>
                     <itemizedlist>
                         <para>
                             For detailed instructions for the manual setup please see:
@@ -1121,14 +1270,26 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
 <screen># <userinput>yum install kolab-webclient-database</userinput></screen>
 
             </para>
-            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Configuration">
-                <title>Configuration</title>
+            <section id="sect-Installation_Guide-Installation_of_the_Kolab_Webclient_Database_component-Webclient_Database_Configuration">
+                <title>Webclient Database Configuration</title>
                 <para>
                     To configure the webclient-database component, please run the provided configuration script:
 <screen># <userinput>/opt/kolab/bin/webclient-database-setup</userinput></screen>
 
                 </para>
                 <para>
+                    <filename>/path/to/file</filename>
+                </para>
+                <blockquote id="bloc-Installation_Guide-Webclient_Database_Configuration-title">
+                    <title>title</title>
+
+<screen>var =    <replaceable>value</replaceable></screen>
+                    <para>
+                        blabla
+                    </para>
+
+                </blockquote>
+                <para>
                     <itemizedlist>
                         <para>
                             For detailed instructions for the manual setup please see:


commit 7a70927b982b85501d8bf2ec4632e49f67e8e6b0
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Jul 19 13:09:33 2011 +0200

    updated main.cf

diff --git a/Installation_Guide/default configuration files/main.cf b/Installation_Guide/default configuration files/main.cf
index 98242ad..43f8a98 100644
--- a/Installation_Guide/default configuration files/main.cf	
+++ b/Installation_Guide/default configuration files/main.cf	
@@ -25,7 +25,7 @@ virtual_alias_maps = ldap:/etc/postfix/ldap/virtual_alias_maps.cf,
 
 unknown_local_recipient_reject_code = 550
 
-smtpd_tls_cert_file = /etc/pki/tls/certs/host.example.org.crt
+smtpd_tls_cert_file = /etc/pki/tls/certs/host.example.org.cert
 smtpd_tls_key_file = /etc/pki/tls/private/host.example.org.key
 smtpd_tls_received_header = yes
 smtpd_tls_security_level = may
@@ -36,7 +36,6 @@ smtpd_client_connection_count_limit = 2048
 
 smtpd_recipient_restrictions = permit_mynetworks
     reject_unauth_pipelining
-    reject_rbl_client zen.spamhaus.org
     reject_non_fqdn_recipient
     reject_invalid_helo_hostname
     reject_unknown_recipient_domain
@@ -57,9 +56,6 @@ submission_sender_restrictions = reject_non_fqdn_sender
     permit_sasl_authenticated
     reject
 
-relayhost = [10.10.90.254]
-default_transport = smtp:[10.10.90.254]
-
 # Enable this if you have broken clients (Microsoft Products <= 2005)
 broken_sasl_auth_clients = no
 # Point to the specific SASL configuration, blank is SASL default
@@ -94,5 +90,3 @@ mailq_path = /usr/bin/mailq.postfix
 setgid_group = postdrop
 html_directory = no
 manpage_directory = /usr/share/man
-sample_directory = /usr/share/doc/postfix-2.3.3/samples
-readme_directory = /usr/share/doc/postfix-2.3.3/README_FILES





More information about the commits mailing list