6 commits - Administrator_Guide/en-US Common_Content/en-US Deployment_Guide/en-US Deployment_Guide/Makefile Installation_Guide/en-US Installation_Guide/Makefile

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Jun 28 10:35:59 CEST 2011


 Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml                                       |   60 
 Common_Content/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png |binary
 Common_Content/en-US/images/high_availability-storage_level_replication-cold_failover.png        |binary
 Common_Content/en-US/images/kolab_deployment_overview-large_scale.png                            |binary
 Common_Content/en-US/images/kolab_server-primary_components-overview.png                         |binary
 Common_Content/en-US/images/traditional_kolab_deployment.png                                     |binary
 Deployment_Guide/Makefile                                                                        |    5 
 Deployment_Guide/en-US/Book_Info.xml                                                             |    4 
 Deployment_Guide/en-US/Capacity_Planning.xml                                                     |  726 ++++++++++
 Deployment_Guide/en-US/Deployment_Guide.ent                                                      |    4 
 Deployment_Guide/en-US/Deployment_Guide.xml                                                      |    3 
 Deployment_Guide/en-US/High_Availability.xml                                                     |   81 +
 Deployment_Guide/en-US/Infrastructure.xml                                                        |    3 
 Deployment_Guide/en-US/Kolab_Groupware_Components.xml                                            |  220 +++
 Deployment_Guide/en-US/images/kolab_deployment_overview-large_scale.png                          |binary
 Deployment_Guide/en-US/images/traditional_kolab_deployment.png                                   |binary
 Installation_Guide/Makefile                                                                      |    2 
 Installation_Guide/en-US/Book_Info.xml                                                           |    2 
 Installation_Guide/en-US/Installation_Guide.ent                                                  |    3 
 Installation_Guide/en-US/Kolab_Server_Installation.xml                                           |   64 
 20 files changed, 1165 insertions(+), 12 deletions(-)

New commits:
commit 3d3276f0b8b09bdea38576f32680c6cec8fa08c5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:35:31 2011 +0100

    Add in a few notes on kolab.conf from scratch

diff --git a/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml b/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
index 6843e77..ceee91b 100644
--- a/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
+++ b/Administrator_Guide/en-US/Configuring_the_Kolab_Server.xml
@@ -85,6 +85,66 @@
 
     </section>
 
+    <section id="sect-Administrator_Guide-Configuring_the_Kolab_Server-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System">
+        <title>Using the Kolab Perl Libraries on a non-Kolab System</title>
+        <para>
+            When using the <application>perl-Kolab</application> libraries on a system that is not a Kolab server itself, please be aware the perl-Kolab libraries expect and/or require certain settings to be available that are not really relevant for normal operations. This section explains which settings are expected and/or required, how to configure them and what the implications are.
+        </para>
+        <para>
+            An example use-case scenario –to install and use the Kolab perl libraries on a system that is not a Kolab server– is, where user provisioning scripts are executed outside of Kolab, and require interfacing with Kolab's IMAP server components to manage user or shared mailboxes.
+        </para>
+        <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Recommended_Settings">
+            <title>Recommended Settings</title>
+            <para>
+                The following is a snippet of the configuration file <filename>/etc/kolab/kolab.conf</filename> that prevents perl errors from being printed to <code>stderr</code>;
+            </para>
+
+        </formalpara>
+        <para>
+
+<screen>kolab_usr: kolab
+kolab_musr: kolab
+kolab_rusr: kolab
+kolab_grp: kolab
+kolab_mgrp: kolab
+kolab_rgrp: kolab</screen>
+
+        </para>
+        <para>
+            In a traditional Kolab deployment, these settings are used with the configuration management utilities. On a server that is not a Kolab server, naturally the configuration management does not apply. However, the Kolab perl libraries still require these settings to be available for errors to be suppressed.
+        </para>
+        <para>
+            Please see <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=114" /> for more information.
+        </para>
+        <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-Required_Settings">
+            <title>Required Settings</title>
+            <para>
+                The following are settings required;
+            </para>
+
+        </formalpara>
+        <para>
+            <itemizedlist>
+                <listitem>
+                    <formalpara id="form-Administrator_Guide-Using_the_Kolab_Perl_Libraries_on_a_non_Kolab_System-connect_addr">
+                        <title><literal>connect_addr</literal></title>
+                        <para>
+                            The connection address for the Kolab perl libraries. Currently this is being used for IMAP connections.
+                        </para>
+
+                    </formalpara>
+                    <para>
+                        See <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=112">Bugzilla #112: <emphasis>Use of connect_addr, local_addr, bind_addr and bind_any</emphasis></ulink> and <ulink url="https://bugzilla.kolabsys.com/show_bug.cgi?id=115">Bugzilla #115: <emphasis>NEW</emphasis></ulink> for more information.
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
 
 </chapter>
 


commit f9f1139d2ea9ded82a6b50179ce4559808c02792
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:34:26 2011 +0100

    Update Installation Guide with additional installation instructions

diff --git a/Installation_Guide/en-US/Installation_Guide.ent b/Installation_Guide/en-US/Installation_Guide.ent
index 4a1d7f7..a4b24e0 100644
--- a/Installation_Guide/en-US/Installation_Guide.ent
+++ b/Installation_Guide/en-US/Installation_Guide.ent
@@ -1,5 +1,5 @@
 <!ENTITY PRODUCT "Kolab">
-<!ENTITY PRODUCT_VERSION "2.3">
+<!ENTITY PRODUCT_VERSION "2.4">
 <!ENTITY BOOKID "Installation_Guide">
 <!ENTITY YEAR "2010">
 <!ENTITY HOLDER "Kolab Systems AG">
@@ -31,4 +31,3 @@
 <!ENTITY CYRUS_ANNOTATIONS_CONFIG "<filename>/etc/imapd.annotations.conf</filename>">
 <!ENTITY CYRUS_CONFIGDIR "<filename>/var/lib/imap</filename>">
 <!ENTITY CYRUS_SPOOLDIR "<filename>/var/spool/imap</filename>">
-
diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index 00eeaa3..7dc7c24 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -850,8 +850,50 @@ E: Broken packages</screen>
                 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. The <literal>kolab-&PRODUCT_VERSION;-community-release</literal> package contains the configuration for the stable software channels, e.g. <emphasis>release</emphasis> and <emphasis>updates</emphasis>.
+                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">
+                        <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>
+                <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>
+            <formalpara>
+                <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.
+                </para>
+            </formalpara>
+            <formalpara>
+                <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.
+                </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>
@@ -862,13 +904,13 @@ E: Broken packages</screen>
                         <itemizedlist>
                             <listitem>
                                 <para>
-                                    <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el5/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 5</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.3/el5/release/i386/repoview/kolab-2.3-enterprise-release.html">Enterprise Linux 5</ulink>
+                                    <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</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</ulink>
                                 </para>
 
                             </listitem>
                             <listitem>
                                 <para>
-                                    <ulink condition="community" url="http://mirror.kolabsys.com/pub/redhat/kolab-2.3/el6/release/i386/repoview/kolab-2.3-community-release.html">Enterprise Linux 6</ulink> <ulink condition="enterprise" url="https://mirror.kolabsys.com/redhat/kolab-2.3/el6/release/i386/repoview/kolab-2.3-enterprise-release.html">Enterprise Linux 6</ulink>
+                                    <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</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</ulink>
                                 </para>
 
                             </listitem>
@@ -938,6 +980,20 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                     </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>
+                        <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>
+                </step>
 
             </procedure>
 
@@ -975,7 +1031,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 </step>
                 <step>
                     <para>
-                        The repositories that have been installed using the <application condition="community">kolab-&PRODUCT_VERSION;-community-release</application><application condition="enterprise">kolab-&PRODUCT_VERSION;-enterprise-release</application> 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 then 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.
+                        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 then 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>


commit 7bc5da962c86a801f52a4b93f34a0aa9291d0c8d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:34:01 2011 +0100

    Version is 2.4

diff --git a/Installation_Guide/Makefile b/Installation_Guide/Makefile
index d404559..519263e 100644
--- a/Installation_Guide/Makefile
+++ b/Installation_Guide/Makefile
@@ -14,7 +14,7 @@ upload: clean clean_ids
 	@for audience in enterprise community; do \
 		sed -r -i -e "s/^condition:.*/condition: $$audience/g" publican.cfg; \
 		publican build --langs=en-US --formats=html,html-single,pdf; \
-		rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/; \
+		rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.4-docs/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_$(PACKAGE)/; \
 	done
 	@sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
 
diff --git a/Installation_Guide/en-US/Book_Info.xml b/Installation_Guide/en-US/Book_Info.xml
index ee3bf89..70dac7d 100644
--- a/Installation_Guide/en-US/Book_Info.xml
+++ b/Installation_Guide/en-US/Book_Info.xml
@@ -7,7 +7,7 @@
     <title>Installation Guide</title>
     <subtitle>The Kolab Groupware Solution</subtitle>
     <productname>Kolab</productname>
-    <productnumber>2.3</productnumber>
+    <productnumber>2.4</productnumber>
     <edition>1</edition>
     <pubsnumber>0</pubsnumber>
     <abstract>


commit e2950db6a4028f15fe6fd441a9be3b116b80f760
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:33:30 2011 +0100

    Add in some common content images

diff --git a/Common_Content/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png b/Common_Content/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png
new file mode 100644
index 0000000..95a5b05
Binary files /dev/null and b/Common_Content/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png differ
diff --git a/Common_Content/en-US/images/high_availability-storage_level_replication-cold_failover.png b/Common_Content/en-US/images/high_availability-storage_level_replication-cold_failover.png
new file mode 100644
index 0000000..14eb7d2
Binary files /dev/null and b/Common_Content/en-US/images/high_availability-storage_level_replication-cold_failover.png differ
diff --git a/Common_Content/en-US/images/kolab_deployment_overview-large_scale.png b/Common_Content/en-US/images/kolab_deployment_overview-large_scale.png
new file mode 100644
index 0000000..3d50c8b
Binary files /dev/null and b/Common_Content/en-US/images/kolab_deployment_overview-large_scale.png differ
diff --git a/Common_Content/en-US/images/kolab_server-primary_components-overview.png b/Common_Content/en-US/images/kolab_server-primary_components-overview.png
new file mode 100644
index 0000000..c824b09
Binary files /dev/null and b/Common_Content/en-US/images/kolab_server-primary_components-overview.png differ
diff --git a/Common_Content/en-US/images/traditional_kolab_deployment.png b/Common_Content/en-US/images/traditional_kolab_deployment.png
new file mode 100644
index 0000000..7a24f74
Binary files /dev/null and b/Common_Content/en-US/images/traditional_kolab_deployment.png differ


commit 771940bc20e607decc03a73aec1504afd7c95d12
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:32:38 2011 +0100

    Add in the latest additions to the Deployment Guide

diff --git a/Deployment_Guide/en-US/Book_Info.xml b/Deployment_Guide/en-US/Book_Info.xml
index 5aba909..3cd119d 100644
--- a/Deployment_Guide/en-US/Book_Info.xml
+++ b/Deployment_Guide/en-US/Book_Info.xml
@@ -5,9 +5,9 @@
 ]>
 <bookinfo id="book-Deployment_Guide-Deployment_Guide">
     <title>Deployment Guide</title>
-    <subtitle>short description</subtitle>
+    <subtitle>Deploying a Kolab Groupware Environment</subtitle>
     <productname>Kolab</productname>
-    <productnumber>2.3.0</productnumber>
+    <productnumber>2.4</productnumber>
     <edition>0</edition>
     <pubsnumber>0</pubsnumber>
     <abstract>
diff --git a/Deployment_Guide/en-US/Capacity_Planning.xml b/Deployment_Guide/en-US/Capacity_Planning.xml
new file mode 100644
index 0000000..4619730
--- /dev/null
+++ b/Deployment_Guide/en-US/Capacity_Planning.xml
@@ -0,0 +1,726 @@
+<?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 "Deployment_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Deployment_Guide-Capacity_Planning">
+    <title>Capacity Planning</title>
+    <para>
+        This chapter outlines best practices for planning the required and/or desired capacity.
+    </para>
+    <important>
+        <title>Assumptions</title>
+        <para>
+            Please note that the numbers here are illustrative, and based on a large number of assumptions. Making the assumptions is not as bad as it sounds; not recognizing the assumptions made to draw a conclusion from the result is far worse.
+        </para>
+
+    </important>
+    <para>
+        Many things relate to capacity planning, including but not limited to;
+    </para>
+    <para>
+        <itemizedlist>
+            <listitem>
+                <para>
+                    User & usage profiles,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Total, concurrent number of users,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Duration of, and percentage of workload pushed through during, the peak usage period,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Number of emails with attachments, type of emails, average sizes, traffic flows,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Corporate policies, local regulations,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    High-availability requirements,
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Use of Quotas
+                </para>
+
+            </listitem>
+
+        </itemizedlist>
+
+    </para>
+    <para>
+        In this illustrative scenario, the user and usage profiles listed in <xref linkend="tabl-Deployment_Guide-Capacity_Planning-User_Profiles" /> are used for capacity planning. The user profiles do not necessarily represent any given environment accurately. If you have statistics available, you should use those instead to classify and quantify your users.
+    </para>
+    <para>
+        <table frame="all" id="tabl-Deployment_Guide-Capacity_Planning-User_Profiles" pgwide="1">
+            <title>User Profiles</title>
+            <tgroup cols="7">
+                <colspec colname="c1"></colspec>
+                <colspec colname="c2"></colspec>
+                <colspec colname="c3"></colspec>
+                <colspec colname="c4"></colspec>
+                <colspec colname="c5"></colspec>
+                <colspec colname="c6"></colspec>
+                <colspec colname="c7"></colspec>
+                <thead>
+                    <row>
+                        <entry>
+                            Profile
+                        </entry>
+                        <entry>
+                            Percentage
+                        </entry>
+                        <entry>
+                            Receives
+                        </entry>
+                        <entry>
+                            Sends
+                        </entry>
+                        <entry>
+                            Reads
+                        </entry>
+                        <entry>
+                            Deletes
+                        </entry>
+                        <entry>
+                            Logins
+                        </entry>
+
+                    </row>
+
+                </thead>
+                <tbody>
+                    <row>
+                        <entry>
+                            Light
+                        </entry>
+                        <entry>
+                            25%
+                        </entry>
+                        <entry>
+                            20
+                        </entry>
+                        <entry>
+                            5
+                        </entry>
+                        <entry>
+                            20
+                        </entry>
+                        <entry>
+                            10
+                        </entry>
+                        <entry>
+                            2
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Medium
+                        </entry>
+                        <entry>
+                            55%
+                        </entry>
+                        <entry>
+                            40
+                        </entry>
+                        <entry>
+                            10
+                        </entry>
+                        <entry>
+                            40
+                        </entry>
+                        <entry>
+                            20
+                        </entry>
+                        <entry>
+                            2
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Heavy
+                        </entry>
+                        <entry>
+                            10%
+                        </entry>
+                        <entry>
+                            80
+                        </entry>
+                        <entry>
+                            20
+                        </entry>
+                        <entry>
+                            80
+                        </entry>
+                        <entry>
+                            40
+                        </entry>
+                        <entry>
+                            2
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Very Heavy
+                        </entry>
+                        <entry>
+                            10%
+                        </entry>
+                        <entry>
+                            120
+                        </entry>
+                        <entry>
+                            30
+                        </entry>
+                        <entry>
+                            120
+                        </entry>
+                        <entry>
+                            60
+                        </entry>
+                        <entry>
+                            2
+                        </entry>
+
+                    </row>
+
+                </tbody>
+
+            </tgroup>
+
+        </table>
+
+    </para>
+    <para>
+        Additionally, the parameters listed in <xref linkend="tabl-Deployment_Guide-Capacity_Planning-Capacity_Planning_Parameters" /> are used to make the calculations for this illustrative scenario.
+    </para>
+    <para>
+        <table frame="all" id="tabl-Deployment_Guide-Capacity_Planning-Capacity_Planning_Parameters" pgwide="1">
+            <title>Capacity Planning Parameters</title>
+            <tgroup cols="4">
+                <colspec colname="c1" colwidth="3*"></colspec>
+                <colspec colname="c2"></colspec>
+                <colspec colname="c3"></colspec>
+                <colspec colname="c4" colwidth="5*"></colspec>
+                <thead>
+                    <row>
+                        <entry>
+                            Title
+                        </entry>
+                        <entry>
+                            Value
+                        </entry>
+                        <entry>
+                            Units
+                        </entry>
+                        <entry>
+                            Description / Remark
+                        </entry>
+
+                    </row>
+
+                </thead>
+                <tbody>
+                    <row>
+                        <entry>
+                            Number of Users
+                        </entry>
+                        <entry>
+                            1,000,000
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Average Mail Size
+                        </entry>
+                        <entry>
+                            50
+                        </entry>
+                        <entry>
+                            KB
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Quota
+                        </entry>
+                        <entry>
+                            1024
+                        </entry>
+                        <entry>
+                            MB
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Webmail Polling Interval
+                        </entry>
+                        <entry>
+                            300
+                        </entry>
+                        <entry>
+                            seconds
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Polling Cost (Incoming)
+                        </entry>
+                        <entry>
+                            1
+                        </entry>
+                        <entry>
+                            KB
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Polling Cost (Outgoing)
+                        </entry>
+                        <entry>
+                            1
+                        </entry>
+                        <entry>
+                            KB
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Users Logged In
+                        </entry>
+                        <entry>
+                            10
+                        </entry>
+                        <entry>
+                            %
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Users Interacting
+                        </entry>
+                        <entry>
+                            5
+                        </entry>
+                        <entry>
+                            %
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Interaction Factor
+                        </entry>
+                        <entry>
+                            4
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+                            How often does the webmail user interact with the interface, per minute, when considered "actively interacting"? This is the number of *additional* hits per minute
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Interaction Cost
+                        </entry>
+                        <entry>
+                            4
+                        </entry>
+                        <entry>
+                            KB
+                        </entry>
+                        <entry>
+                            Cost of a single interaction hit
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Hours / day
+                        </entry>
+                        <entry>
+                            10
+                        </entry>
+                        <entry>
+                            h
+                        </entry>
+                        <entry>
+                            Number of hours per day, users are considered to be working.
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+                            Duration of peak period
+                        </entry>
+                        <entry>
+                            120
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+                            The duration of the day's peak usage, in minutes
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+                    <row>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+                        <entry>
+
+                        </entry>
+
+                    </row>
+
+                </tbody>
+
+            </tgroup>
+
+        </table>
+
+    </para>
+    <note>
+        <title>Assistance with Capacity Planning</title>
+        <para>
+            Kolab Systems can provide you with assistance and full capacity planning customized to your environment and requirements. For more information, please contact <ulink url="mailto:sales at kolabsys.com?Subject=Capacity Planning">sales at kolabsys.com</ulink>.
+        </para>
+
+    </note>
+</chapter>
+
diff --git a/Deployment_Guide/en-US/Deployment_Guide.ent b/Deployment_Guide/en-US/Deployment_Guide.ent
index 1b45b53..466a53d 100644
--- a/Deployment_Guide/en-US/Deployment_Guide.ent
+++ b/Deployment_Guide/en-US/Deployment_Guide.ent
@@ -1,4 +1,4 @@
 <!ENTITY PRODUCT "Kolab">
 <!ENTITY BOOKID "Deployment_Guide">
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "| You need to change the HOLDER entity in the en-US/Deployment_Guide.ent file |">
+<!ENTITY YEAR "2011">
+<!ENTITY HOLDER "Kolab Systems AG">
diff --git a/Deployment_Guide/en-US/Deployment_Guide.xml b/Deployment_Guide/en-US/Deployment_Guide.xml
index ca47641..d54d83b 100644
--- a/Deployment_Guide/en-US/Deployment_Guide.xml
+++ b/Deployment_Guide/en-US/Deployment_Guide.xml
@@ -6,8 +6,11 @@
 <book>
     <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Kolab_Groupware_Components.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="Capacity_Planning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Infrastructure.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="Kolab_Preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    <xi:include href="High_Availability.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/Deployment_Guide/en-US/High_Availability.xml b/Deployment_Guide/en-US/High_Availability.xml
new file mode 100644
index 0000000..4f97bb9
--- /dev/null
+++ b/Deployment_Guide/en-US/High_Availability.xml
@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Deployment_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<appendix id="appe-Deployment_Guide-High_Availability">
+    <title>High Availability</title>
+    <para>
+        High availability is most commonly a prerequisite characteristic for deployments of application and/or service environments considered critical to an organization's day-to-day operations. The requirement to be able to guarantee service continuity is assigned a certain degree or level and translates into the following technical terms;
+    </para>
+    <para>
+        <itemizedlist>
+            <listitem>
+                <para>
+                    Service Availability & Performance
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Data Redundancy & Replication
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Site Reliability
+                </para>
+
+            </listitem>
+            <listitem>
+                <para>
+                    Failover Scenarios
+                </para>
+
+            </listitem>
+
+        </itemizedlist>
+
+    </para>
+    <para>
+        This appendix addresses high availability as it applies to the Kolab Groupware environment for using different failure and failover scenarios.
+    </para>
+    <section id="sect-Deployment_Guide-High_Availability-Service_Availability_amp_Performance">
+        <title>Service Availability & Performance</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-High_Availability-Data_Redundancy_amp_Replication">
+        <title>Data Redundancy & Replication</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-High_Availability-Site_Reliability">
+        <title>Site Reliability</title>
+        <para>
+            The term site-reliability applies to complete failover of one or more application and/or service environments serviced from one site during normal operations, to then be serviced from another site upon failover.
+        </para>
+        <para>
+            Different degrees of site-reliability are available. For example, the failover site may have less resources available. Suppose the failover site can make available up to 50% of total processing capacity required for the service to operate at full capacity. The service may show degraded performance, but continues to be generally available. At a lower cost, this scenario still achieves a degree of site-reliability as availability of the service is impacted only for the duration to achieve the complete failover, despite the fact it may be available with significantly degraded performance.
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-High_Availability-Failover_Scenarios">
+        <title>Failover Scenarios</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+
+</appendix>
+
diff --git a/Deployment_Guide/en-US/Infrastructure.xml b/Deployment_Guide/en-US/Infrastructure.xml
index 2fdd93f..dc24cf0 100644
--- a/Deployment_Guide/en-US/Infrastructure.xml
+++ b/Deployment_Guide/en-US/Infrastructure.xml
@@ -13,6 +13,9 @@
         <para>
             The Kolab Groupware solution integrates with LDAP particularly well, but of course has certain prerequisites to the LDAP technology used, the exact LDAP schemas loaded and if you already have LDAP implemented, the way LDAP is used and maintained today.
         </para>
+        <para>
+            Kolab depends on a set of LDAP Schema extensions which allow user policies and node configuration to be stored in LDAP, so that it can be picked up by all nodes in the groupware environment.
+        </para>
 
     </section>
 
diff --git a/Deployment_Guide/en-US/Kolab_Groupware_Components.xml b/Deployment_Guide/en-US/Kolab_Groupware_Components.xml
new file mode 100644
index 0000000..31fdf9f
--- /dev/null
+++ b/Deployment_Guide/en-US/Kolab_Groupware_Components.xml
@@ -0,0 +1,220 @@
+<?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 "Deployment_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Deployment_Guide-Kolab_Groupware_Components">
+    <title>Kolab Groupware Components</title>
+    <para>
+        The Kolab Groupware Server consists of the primary components outlined in <xref linkend="item-Deployment_Guide-Kolab_Groupware_Components-Primary_Kolab_Groupware_Server_Components" />. Each of these components allow scaling up and down both horizontally as well as vertically. This chapter outlines a high-level overview of your options.
+    </para>
+    <para>
+        <itemizedlist id="item-Deployment_Guide-Kolab_Groupware_Components-Primary_Kolab_Groupware_Server_Components">
+            <title>Primary Kolab Groupware Server Components</title>
+            <listitem>
+                <formalpara id="form-Deployment_Guide-Primary_Kolab_Groupware_Server_Components-IMAP_Storage_Backend">
+                    <title>IMAP Storage Backend</title>
+                    <para>
+                        Kolab Groupware stores the groupware information in IMAP folders. Contacts, events and other groupware related information is stored as an attachment to a mail message. A folder is <emphasis>annotated</emphasis> to indicate the type of groupware content stored in that folder.
+                    </para>
+
+                </formalpara>
+                <note>
+                    <title>Cyrus IMAP Recommended</title>
+                    <para>
+                        Kolab Systems recommends the use of Cyrus IMAP as the IMAP storage backend, as is the default that comes with Kolab Groupware. Cyrus IMAP is fast, efficient, scalable.
+                    </para>
+
+                </note>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Deployment_Guide-Primary_Kolab_Groupware_Server_Components-Mail_Transfer_Agent">
+                    <title>Mail Transfer Agent</title>
+                    <para>
+                        The mail transfer agent (<emphasis>MTA</emphasis>) is used to send and receive messages between nodes in the Kolab Groupware environment and to exchange mail with external applications, other groupware environments and the outside world.
+                    </para>
+
+                </formalpara>
+                <note>
+                    <title>Postfix Recommended</title>
+                    <para>
+                        Kolab Systems recommends you use Postfix as the mail transfer agent, as is the default that comes with Kolab Groupware. Postfix represents great flexibility, integration, security and scalability.
+                    </para>
+
+                </note>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Deployment_Guide-Primary_Kolab_Groupware_Server_Components-Authentication_and_Authorization_Database">
+                    <title>Authentication and Authorization Database</title>
+                    <para>
+                        The authentication (<emphasis>authn</emphasis>) and authorization (<emphasis>authz</emphasis>) database holds all user and group information, as well as, at your option, the <emphasis>global address book</emphasis>.
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+            <listitem>
+                <formalpara id="form-Deployment_Guide-Primary_Kolab_Groupware_Server_Components-Clients_amp_3rd_Party_Applications">
+                    <title>Clients & 3rd Party Applications</title>
+                    <para>
+                        Included in the category of server components are 3rd party applications integrated with the Kolab Groupware solution, such as the web mail interface, or XMPP services.
+                    </para>
+
+                </formalpara>
+
+            </listitem>
+
+        </itemizedlist>
+
+    </para>
+    <section id="sect-Deployment_Guide-Kolab_Groupware_Components-Traditional_Kolab_Groupware_Deployment">
+        <title>Traditional Kolab Groupware Deployment</title>
+        <para>
+            A traditional Kolab Groupware deployment starts out with one Kolab server, which has all of the primary components installed. As the Kolab Groupware environment is used more extensively and/or more 3rd party applications are integrated with Kolab, the environment scales through attaching one or more slave nodes.
+        </para>
+        <para>
+            This type of scaling is illustrated in <xref linkend="figu-Deployment_Guide-Large_scale_Kolab_Groupware_Deployment-Scaling_amp_Positioning_Kolab_Groupware_Server_Components" />. There is a number of constraints to this type of scaling architecture which impact its feasibility for larger environments, such as redundancy, high-availability and load-balancing capabilities.
+        </para>
+        <para>
+            That is not to say the traditional model does not perform or is not sustainable. Typically, a traditional deployment of a Kolab Groupware environment –provided sufficient processing, memory and disk, of course– can scale up to serve thousands of users without problems.
+        </para>
+        <figure id="figu-Deployment_Guide-Traditional_Kolab_Groupware_Deployment-Overview_of_a_Traditional_Kolab_Groupware_Server_Environment_Scaled_Out">
+            <title>Overview of a Traditional Kolab Groupware Server Environment Scaled Out</title>
+            <mediaobject>
+                <imageobject>
+                    <imagedata fileref="images/traditional_kolab_deployment.png" format="PNG" scalefit="1" width="444" />
+                </imageobject>
+
+            </mediaobject>
+
+        </figure>
+        <para>
+            However, if any of the keywords listed in <xref linkend="item-Deployment_Guide-Traditional_Kolab_Groupware_Deployment-Keywords_to_Use_to_Recognize_Traditional_is_Not_For_You" /> occur as prerequisites in the project planning, please refer to <xref linkend="sect-Deployment_Guide-Kolab_Groupware_Components-Large_scale_Kolab_Groupware_Deployment" />.
+        </para>
+        <para>
+            <itemizedlist id="item-Deployment_Guide-Traditional_Kolab_Groupware_Deployment-Keywords_to_Use_to_Recognize_Traditional_is_Not_For_You">
+                <title>Keywords to Use to Recognize "Traditional" is Not For You</title>
+                <listitem>
+                    <para>
+                        High-availability
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Load-balancing
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Disaster Recovery
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Site-reliability
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Cold/Warm/Hot Standby Failover
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Storage Tiers
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-Kolab_Groupware_Components-Large_scale_Kolab_Groupware_Deployment">
+        <title>Large-scale Kolab Groupware Deployment</title>
+        <para>
+            Large scale Kolab Groupware deployments require the ability to scale up one of the components listed in <xref linkend="item-Deployment_Guide-Kolab_Groupware_Components-Primary_Kolab_Groupware_Server_Components" /> separate from the other components. This further reduces cost, maintenance overhead and overall environment architecture complexity.
+        </para>
+        <para>
+            To that effect, Kolab Systems recommends considering the environment architecture illustrated in <xref linkend="figu-Deployment_Guide-Large_scale_Kolab_Groupware_Deployment-Scaling_amp_Positioning_Kolab_Groupware_Server_Components" />, which shows the following characteristics;
+        </para>
+        <para>
+            <itemizedlist>
+                <listitem>
+                    <para>
+                        All components can, individually, be scaled up and down both horizontally as well as vertically,
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Relevant components are split up so they can be positioned in the appropriate network segment,
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Individual components are load-balanced across nodes, implicitly achieving some level of high-availability,
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Each node can be taken out of rotation and serviced without impact to service availability<footnote> <para>
+                            Note that while service availability would not be impacted, service performance may be degraded during this service window.
+                        </para>
+                        </footnote>,
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Individual components can be made highly available to a certain degree of saturation,
+                    </para>
+
+                </listitem>
+                <listitem>
+                    <para>
+                        Individual components can be positioned to use different tiers of virtualization, storage and network,
+                    </para>
+
+                </listitem>
+
+            </itemizedlist>
+
+        </para>
+        <figure id="figu-Deployment_Guide-Large_scale_Kolab_Groupware_Deployment-Scaling_amp_Positioning_Kolab_Groupware_Server_Components">
+            <title>Scaling & Positioning Kolab Groupware Server Components</title>
+            <mediaobject>
+                <imageobject>
+                    <imagedata fileref="images/kolab_deployment_overview-large_scale.png" format="PNG" scalefit="1" width="444" />
+                </imageobject>
+
+            </mediaobject>
+
+        </figure>
+        <para>
+            Each of these components can be scaled up and down at your discretion, while the architecture allows for improved capacity planning, better monitoring, management and overall sustainability.
+        </para>
+        <note>
+            <title>In this Document</title>
+            <para>
+                In this document, all individual components are zoomed in to separately, so that options and consequences in terms of sceurity, scalability, high-availability and load-balancing can be taken into account.
+            </para>
+
+        </note>
+
+    </section>
+
+
+</chapter>
+
diff --git a/Deployment_Guide/en-US/images/kolab_deployment_overview-large_scale.png b/Deployment_Guide/en-US/images/kolab_deployment_overview-large_scale.png
new file mode 100644
index 0000000..3d50c8b
Binary files /dev/null and b/Deployment_Guide/en-US/images/kolab_deployment_overview-large_scale.png differ
diff --git a/Deployment_Guide/en-US/images/traditional_kolab_deployment.png b/Deployment_Guide/en-US/images/traditional_kolab_deployment.png
new file mode 100644
index 0000000..7a24f74
Binary files /dev/null and b/Deployment_Guide/en-US/images/traditional_kolab_deployment.png differ


commit 047ece337e5db3f1a0e5539c41504d22bd519f2b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 28 09:28:19 2011 +0100

    Update Makefile to include common content images and add fast-upload make target

diff --git a/Deployment_Guide/Makefile b/Deployment_Guide/Makefile
index 47fab14..b71d214 100644
--- a/Deployment_Guide/Makefile
+++ b/Deployment_Guide/Makefile
@@ -6,11 +6,16 @@ all: clean clean_ids
 upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.4-docs/$(PACKAGE)/
 
+fast-upload: clean clean_ids
+	@publican build --langs=en-US --formats=html
+	@rsync -aHvz tmp/en-US/html/ hosted.kolabsys.com:./public_html/kolab-2.4-docs/$(PACKAGE)/html/
+
 clean:
 	@publican clean
 
 clean_ids:
 	@cp -a ../Common_Content/en-US/*.xml en-US/.
+	@cp -a ../Common_Content/en-US/images/* en-US/images/.
 	@publican clean_ids
 	@sed -i -r \
 		-e 's/\t/    /g' \





More information about the commits mailing list