summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen@ergo-project.org>2010-12-13 13:35:38 (GMT)
committerJeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen@ergo-project.org>2010-12-13 13:35:38 (GMT)
commit090f09897fa635c5b844fc7046fb1eaa6e181adb (patch)
treec8660afbbf4e817cfae2bb0620cfdba456e342a1
parente38dad55bcb9eb40b56e12e4f41e3cc3bc6edfa0 (diff)
downloadkolab-docs-090f09897fa635c5b844fc7046fb1eaa6e181adb.tar.gz
Rename Installation Manual to Installation Guide
-rw-r--r--Installation_Guide/en-US/About_Kolab_Groupware.xml (renamed from Installation_Manual/en-US/About_Kolab_Groupware.xml)2
-rw-r--r--Installation_Guide/en-US/Author_Group.xml (renamed from Installation_Manual/en-US/Author_Group.xml)2
-rw-r--r--Installation_Guide/en-US/Book_Info.xml (renamed from Installation_Manual/en-US/Book_Info.xml)2
-rw-r--r--Installation_Guide/en-US/Cyrus_IMAP.xml (renamed from Installation_Manual/en-US/Cyrus_IMAP.xml)2
-rw-r--r--Installation_Guide/en-US/Installation_Guide.ent (renamed from Installation_Manual/en-US/Installation_Manual.ent)4
-rw-r--r--Installation_Guide/en-US/Installation_Guide.xml (renamed from Installation_Manual/en-US/Installation_Manual.xml)3
-rw-r--r--Installation_Guide/en-US/Installation_Introduction.xml (renamed from Installation_Manual/en-US/Installation_Introduction.xml)2
-rw-r--r--Installation_Guide/en-US/Kolab_Initial_Configuration.xml (renamed from Installation_Manual/en-US/Kolab_Initial_Configuration.xml)2
-rw-r--r--Installation_Guide/en-US/Kolab_Server_on_Enterprise_Linux.xml (renamed from Installation_Manual/en-US/Kolab_Server_on_Enterprise_Linux.xml)2
-rw-r--r--Installation_Guide/en-US/Kolab_Systems_Software_Repositories.xml (renamed from Installation_Manual/en-US/Kolab_Systems_Software_Repositories.xml)12
-rw-r--r--Installation_Guide/en-US/Kolab_Webclient_Installation.xml (renamed from Installation_Manual/en-US/Kolab_Webclient_Installation.xml)2
-rw-r--r--Installation_Guide/en-US/Part-Kolab_Server_Installation.xml (renamed from Installation_Manual/en-US/Part-Kolab_Server_Installation.xml)2
-rw-r--r--Installation_Guide/en-US/Preface.xml (renamed from Installation_Manual/en-US/Preface.xml)2
-rw-r--r--Installation_Guide/en-US/Preparing_the_System.xml (renamed from Installation_Manual/en-US/Preparing_the_System.xml)2
-rw-r--r--Installation_Guide/en-US/Revision_History.xml (renamed from Installation_Manual/en-US/Revision_History.xml)2
-rw-r--r--Installation_Guide/publican.cfg (renamed from Installation_Manual/publican.cfg)0
16 files changed, 27 insertions, 16 deletions
diff --git a/Installation_Manual/en-US/About_Kolab_Groupware.xml b/Installation_Guide/en-US/About_Kolab_Groupware.xml
index de5f82c..4008184 100644
--- a/Installation_Manual/en-US/About_Kolab_Groupware.xml
+++ b/Installation_Guide/en-US/About_Kolab_Groupware.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-About_Kolab_Groupware">
diff --git a/Installation_Manual/en-US/Author_Group.xml b/Installation_Guide/en-US/Author_Group.xml
index 24ea95e..5a3f9c8 100644
--- a/Installation_Manual/en-US/Author_Group.xml
+++ b/Installation_Guide/en-US/Author_Group.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<authorgroup>
diff --git a/Installation_Manual/en-US/Book_Info.xml b/Installation_Guide/en-US/Book_Info.xml
index ddad213..da729ad 100644
--- a/Installation_Manual/en-US/Book_Info.xml
+++ b/Installation_Guide/en-US/Book_Info.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<bookinfo id="book-Installation_Manual-Installation_Manual">
diff --git a/Installation_Manual/en-US/Cyrus_IMAP.xml b/Installation_Guide/en-US/Cyrus_IMAP.xml
index 5546f43..7277792 100644
--- a/Installation_Manual/en-US/Cyrus_IMAP.xml
+++ b/Installation_Guide/en-US/Cyrus_IMAP.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<part id="part-Installation_Manual-Cyrus_IMAP">
diff --git a/Installation_Manual/en-US/Installation_Manual.ent b/Installation_Guide/en-US/Installation_Guide.ent
index f6400a2..4a1d7f7 100644
--- a/Installation_Manual/en-US/Installation_Manual.ent
+++ b/Installation_Guide/en-US/Installation_Guide.ent
@@ -1,6 +1,6 @@
<!ENTITY PRODUCT "Kolab">
-<!ENTITY PRODUCT_VERSION "2.3.0">
-<!ENTITY BOOKID "Installation_Manual">
+<!ENTITY PRODUCT_VERSION "2.3">
+<!ENTITY BOOKID "Installation_Guide">
<!ENTITY YEAR "2010">
<!ENTITY HOLDER "Kolab Systems AG">
diff --git a/Installation_Manual/en-US/Installation_Manual.xml b/Installation_Guide/en-US/Installation_Guide.xml
index dfcb359..f275997 100644
--- a/Installation_Manual/en-US/Installation_Manual.xml
+++ b/Installation_Guide/en-US/Installation_Guide.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<book>
@@ -13,6 +13,7 @@
//-->
<xi:include href="Kolab_Systems_Software_Repositories.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" />
diff --git a/Installation_Manual/en-US/Installation_Introduction.xml b/Installation_Guide/en-US/Installation_Introduction.xml
index cd361c8..086e124 100644
--- a/Installation_Manual/en-US/Installation_Introduction.xml
+++ b/Installation_Guide/en-US/Installation_Introduction.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Installation_Introduction">
diff --git a/Installation_Manual/en-US/Kolab_Initial_Configuration.xml b/Installation_Guide/en-US/Kolab_Initial_Configuration.xml
index fb08f1c..cfd15fd 100644
--- a/Installation_Manual/en-US/Kolab_Initial_Configuration.xml
+++ b/Installation_Guide/en-US/Kolab_Initial_Configuration.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Kolab_Initial_Configuration">
diff --git a/Installation_Manual/en-US/Kolab_Server_on_Enterprise_Linux.xml b/Installation_Guide/en-US/Kolab_Server_on_Enterprise_Linux.xml
index 66f9e3b..52be099 100644
--- a/Installation_Manual/en-US/Kolab_Server_on_Enterprise_Linux.xml
+++ b/Installation_Guide/en-US/Kolab_Server_on_Enterprise_Linux.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Kolab_Server_on_Enterprise_Linux">
diff --git a/Installation_Manual/en-US/Kolab_Systems_Software_Repositories.xml b/Installation_Guide/en-US/Kolab_Systems_Software_Repositories.xml
index 847b27a..68a7555 100644
--- a/Installation_Manual/en-US/Kolab_Systems_Software_Repositories.xml
+++ b/Installation_Guide/en-US/Kolab_Systems_Software_Repositories.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Kolab_Systems_Software_Repositories">
@@ -37,6 +37,16 @@
deb-src http://mirror.kolabsys.com/pub/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates</screen>
</para>
</step>
+ <step>
+ <para>
+ To ensure the Kolab packages have priority over the Debian packages, such as must be the case for PHP as well as Cyrus IMAP, please make sure the APT preferences <emphasis>pin</emphasis> the mirror.kolabsys.com origin as a preferred source. Put the following in <filename>/etc/apt/preferences</filename>:
+ </para>
+ <para>
+ <screen>Package: *
+Pin: origin mirror.kolabsys.com
+Pin-Priority: 501</screen>
+ </para>
+ </step>
</procedure>
</section>
diff --git a/Installation_Manual/en-US/Kolab_Webclient_Installation.xml b/Installation_Guide/en-US/Kolab_Webclient_Installation.xml
index 0b8b0db..d42c638 100644
--- a/Installation_Manual/en-US/Kolab_Webclient_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Webclient_Installation.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Kolab_Webclient_Installation">
diff --git a/Installation_Manual/en-US/Part-Kolab_Server_Installation.xml b/Installation_Guide/en-US/Part-Kolab_Server_Installation.xml
index 4c621cb..c0cbc14 100644
--- a/Installation_Manual/en-US/Part-Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Part-Kolab_Server_Installation.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<part id="part-Installation_Manual-Kolab_Server_Installation">
diff --git a/Installation_Manual/en-US/Preface.xml b/Installation_Guide/en-US/Preface.xml
index 3737a00..c88a19a 100644
--- a/Installation_Manual/en-US/Preface.xml
+++ b/Installation_Guide/en-US/Preface.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<preface id="pref-Installation_Manual-Preface">
diff --git a/Installation_Manual/en-US/Preparing_the_System.xml b/Installation_Guide/en-US/Preparing_the_System.xml
index 0cac0f8..3e7fa57 100644
--- a/Installation_Manual/en-US/Preparing_the_System.xml
+++ b/Installation_Guide/en-US/Preparing_the_System.xml
@@ -1,6 +1,6 @@
<?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_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<chapter id="chap-Installation_Manual-Preparing_the_System">
diff --git a/Installation_Manual/en-US/Revision_History.xml b/Installation_Guide/en-US/Revision_History.xml
index f0435f0..9469715 100644
--- a/Installation_Manual/en-US/Revision_History.xml
+++ b/Installation_Guide/en-US/Revision_History.xml
@@ -1,6 +1,6 @@
<?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 "Installation_Manual.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
<appendix id="appe-Installation_Manual-Revision_History">
diff --git a/Installation_Manual/publican.cfg b/Installation_Guide/publican.cfg
index e2e32bf..e2e32bf 100644
--- a/Installation_Manual/publican.cfg
+++ b/Installation_Guide/publican.cfg