Update Deployment Guide

7 files changed, 59 insertions, 8 deletions

diff --git a/Deployment_Guide/Makefile b/Deployment_Guide/Makefile
index b71d214..790640a 100644
--- a/Deployment_Guide/Makefile
+++ b/Deployment_Guide/Makefile
@@ -1,14 +1,11 @@
 PACKAGE = "Deployment_Guide"
 
 all: clean clean_ids
-	@publican build --langs=en-US --formats=html,html-single,pdf
+	@publican build --embedtoc --publish --langs=en-US --formats=html,html-single,pdf
+	@publican install_book --site_config=../site.cfg --lang=en-US
 
 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/
+	@rsync -aHvz publish/en-US/ hosted.kolabsys.com:./public_html/kolab-docs/
 
 clean:
 	@publican clean
diff --git a/Deployment_Guide/en-US/Book_Info.xml b/Deployment_Guide/en-US/Book_Info.xml
index 3cd119d..44e6f9e 100644
--- a/Deployment_Guide/en-US/Book_Info.xml
+++ b/Deployment_Guide/en-US/Book_Info.xml
@@ -6,7 +6,7 @@
 <bookinfo id="book-Deployment_Guide-Deployment_Guide">
     <title>Deployment Guide</title>
     <subtitle>Deploying a Kolab Groupware Environment</subtitle>
-    <productname>Kolab</productname>
+    <productname>Kolab Groupware</productname>
     <productnumber>2.4</productnumber>
     <edition>0</edition>
     <pubsnumber>0</pubsnumber>
diff --git a/Deployment_Guide/en-US/Deployment_Guide.ent b/Deployment_Guide/en-US/Deployment_Guide.ent
index 466a53d..07396ae 100644
--- a/Deployment_Guide/en-US/Deployment_Guide.ent
+++ b/Deployment_Guide/en-US/Deployment_Guide.ent
@@ -1,4 +1,5 @@
-<!ENTITY PRODUCT "Kolab">
+<!ENTITY PRODUCT "Kolab Groupware">
+<!ENTITY PRODUCT_VERSION "2.4">
 <!ENTITY BOOKID "Deployment_Guide">
 <!ENTITY YEAR "2011">
 <!ENTITY HOLDER "Kolab Systems AG">
diff --git a/Deployment_Guide/en-US/LDAP_Integration.xml b/Deployment_Guide/en-US/LDAP_Integration.xml
new file mode 100644
index 0000000..a3530ec
--- /dev/null
+++ b/Deployment_Guide/en-US/LDAP_Integration.xml
@@ -0,0 +1,53 @@
+<?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-LDAP_Integration">
+    <title>LDAP Integration</title>
+    <para>
+        Kolab uses LDAP as the canonical source for user and group information, as well as host configuration.
+    </para>
+    <section id="sect-Deployment_Guide-LDAP_Integration-a389_Directory_Server">
+        <title>389 Directory Server</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-LDAP_Integration-OpenLDAP">
+        <title>OpenLDAP</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-LDAP_Integration-Open_Directory_Server">
+        <title>Open Directory Server</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-LDAP_Integration-Sun_Directory_Server">
+        <title>Sun Directory Server</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+    <section id="sect-Deployment_Guide-LDAP_Integration-Based_on_Netscape_Directory_Server">
+        <title>Based on Netscape Directory Server</title>
+        <para>
+            TODO
+        </para>
+
+    </section>
+
+
+</chapter>
+
diff --git a/Deployment_Guide/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png b/Deployment_Guide/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png
new file mode 100644
index 0000000..95a5b05
--- /dev/null
+++ b/Deployment_Guide/en-US/images/high_availability-node_or_service_level_replication-hot_failover.png
diff --git a/Deployment_Guide/en-US/images/high_availability-storage_level_replication-cold_failover.png b/Deployment_Guide/en-US/images/high_availability-storage_level_replication-cold_failover.png
new file mode 100644
index 0000000..14eb7d2
--- /dev/null
+++ b/Deployment_Guide/en-US/images/high_availability-storage_level_replication-cold_failover.png
diff --git a/Deployment_Guide/en-US/images/kolab_server-primary_components-overview.png b/Deployment_Guide/en-US/images/kolab_server-primary_components-overview.png
new file mode 100644
index 0000000..c824b09
--- /dev/null
+++ b/Deployment_Guide/en-US/images/kolab_server-primary_components-overview.png