6 commits - Administrator_Guide/Makefile Deployment_Guide/Makefile Development_Manual/Makefile Installation_Guide/en-US Installation_Guide/Makefile Release_Notes/Makefile Testing_Reference/Makefile

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Feb 18 14:57:36 CET 2011


 Administrator_Guide/Makefile                                      |    2 
 Deployment_Guide/Makefile                                         |    2 
 Development_Manual/Makefile                                       |    2 
 Installation_Guide/Makefile                                       |   10 ++
 Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml |    4 -
 Installation_Guide/en-US/Kolab_Server_Installation.xml            |   34 +++++-----
 Release_Notes/Makefile                                            |    2 
 Testing_Reference/Makefile                                        |    2 
 8 files changed, 39 insertions(+), 19 deletions(-)

New commits:
commit e419e252b528300b572c295644a94c0a59a6e1f5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:56:57 2011 +0000

    Extend the verbosity / Improve the language yet a little more

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index d92e00b..76142a3 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -510,10 +510,10 @@ deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid rel
 deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates</screen>
 
                     </para>
-
                     <para>
                         For other versions of the Ubuntu distribution, please replace <code>lucid</code> with the corresponding distribution codename.
                     </para>
+
                 </step>
                 <step>
                     <para>
@@ -951,7 +951,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
         <section id="sect-Installation_Guide-Installation_with_RPM_Packages-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 shipped by the Kolab repositories as well as through the regular distribution repositories, and to avoid 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 smooth out any future problems.
+                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>
@@ -968,7 +968,7 @@ kolab-&PRODUCT_VERSION;-updates-testing-source
                 </step>
                 <step>
                     <para>
-                        The repositories that have been installed using the <application>kolab-&PRODUCT_VERSION;-community-release</application> package(s) have a pre-configured priority of <code>50</code>. The default repository priority is <code>99</code>. 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, you are good to go.
+                        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.
                     </para>
 
                 </step>


commit 7c406c49937d3309b972de763b37ff2f83f6085e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:42:59 2011 +0000

    No conditionals needed for Debian/Ubuntu distribution name replacement if you phrase it like this...

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index a4a82ce..d92e00b 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -384,7 +384,7 @@ $ <userinput>sha1sum -c SHA1SUMS</userinput></screen>
             <procedure>
                 <step>
                     <para>
-                        For the public, community version of Kolab &PRODUCT_VERSION; software packages for Debian Squeeze, add the following two lines to <filename>/etc/apt/sources.list</filename>:
+                        For Kolab &PRODUCT_VERSION; software packages for Debian Squeeze, add the following two lines to <filename>/etc/apt/sources.list</filename>:
                     </para>
                     <para condition="community">
 
@@ -398,11 +398,8 @@ deb-src http://mirror.kolabsys.com/pub/debian/kolab-&PRODUCT_VERSION;/ squeeze r
 deb-src https://mirror.kolabsys.com/debian/kolab-&PRODUCT_VERSION;/ squeeze release updates</screen>
 
                     </para>
-                    <para condition="community">
-                        For Debian Lenny, Wheezy or Sid, please replace <code>squeeze</code> with the corresponding distribution codename.
-                    </para>
-                    <para condition="enterprise">
-                        For Debian Lenny, please replace <code>squeeze</code> with the corresponding distribution codename.
+                    <para>
+                        For other versions of the Debian distribution, please replace <code>squeeze</code> with the corresponding distribution codename.
                     </para>
                     <important>
                         <title>Debian Volatile (Updates) Repositories</title>
@@ -499,21 +496,24 @@ Pin-Priority: 501</screen>
             <procedure>
                 <step>
                     <para>
-                        For the public, community version of Kolab &PRODUCT_VERSION; software packages for Ubuntu Natty, add the following two lines to <filename>/etc/apt/sources.list</filename>:
+                        For Kolab &PRODUCT_VERSION; software packages for Ubuntu Lucid, add the following two lines to <filename>/etc/apt/sources.list</filename>:
                     </para>
                     <para condition="community">
 
-<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates
-deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates</screen>
+<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates
+deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates</screen>
 
                     </para>
                     <para condition="enterprise">
 
-<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates
-deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ natty release updates</screen>
+<screen>deb http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates
+deb-src http://mirror.kolabsys.com/pub/ubuntu/kolab-&PRODUCT_VERSION;/ lucid release updates</screen>
 
                     </para>
 
+                    <para>
+                        For other versions of the Ubuntu distribution, please replace <code>lucid</code> with the corresponding distribution codename.
+                    </para>
                 </step>
                 <step>
                     <para>


commit c3c0e50253df3a90c51a22d65380cc0d493136d0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:40:09 2011 +0000

    Touch up some more language in this section

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index a4a00f0..a4a82ce 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -42,14 +42,14 @@
         </para>
         <simplelist>
             <member> OpenPKG itself has become proprietary. </member>
-            <member> Native packaging efforts have been undertaken by various community members. </member>
-            <member> Kolab Groupware through OpenPKG maintained its own copy of the complete dependency stack. </member>
+            <member> Kolab Groupware had to, through OpenPKG, maintain its own copy of the complete dependency stack. </member>
+            <member> Various community members have been developing native APT and RPM packages. </member>
 
         </simplelist>
         <warning>
             <title>OpenPKG Deprecation Warning</title>
             <para>
-                OpenPKG, as a delivery method for Kolab, will be deprecated, thus no longer be made available, with the 3.0 product series. Please refer to the native packaging sections in this guide for instructions on native packages provided by Kolab.
+                OpenPKG, as a distribution method for Kolab, will be deprecated, thus no longer be made available, with the 3.0 product series. Please refer to the native packaging sections in this guide for instructions on native packages provided by Kolab.
             </para>
 
         </warning>


commit 6732a3275337fa9b0680311a8b464c2d59232752
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:37:45 2011 +0000

    Touch up the language a little, on OpenPKG having become proprietary

diff --git a/Installation_Guide/en-US/Kolab_Server_Installation.xml b/Installation_Guide/en-US/Kolab_Server_Installation.xml
index c4a1676..a4a00f0 100644
--- a/Installation_Guide/en-US/Kolab_Server_Installation.xml
+++ b/Installation_Guide/en-US/Kolab_Server_Installation.xml
@@ -41,7 +41,7 @@
             While there certainly are advantages to OpenPKG, it also has a few major downsides:
         </para>
         <simplelist>
-            <member> OpenPKG has become proprietary. </member>
+            <member> OpenPKG itself has become proprietary. </member>
             <member> Native packaging efforts have been undertaken by various community members. </member>
             <member> Kolab Groupware through OpenPKG maintained its own copy of the complete dependency stack. </member>
 


commit 8ec3160be22a00528272563c193017a775b24d5f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:34:01 2011 +0000

    Fix typo

diff --git a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
index 3a9c545..50955d4 100644
--- a/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
+++ b/Installation_Guide/en-US/Bootstrapping_the_Kolab_Installation.xml
@@ -15,8 +15,8 @@
         </para>
 
     </important>
-    <section id="sect-Installation_Guide-Bootstrapping_the_Kolab_Installation-Preperating_the_System_for_Bootstrapping">
-        <title>Preperating the System for Bootstrapping</title>
+    <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>


commit 0d0c538e3924ed6ac9f5ca6778685a14a04c45ad
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Feb 18 13:24:01 2011 +0000

    Create different make targets for all formats and languages versus uploading the content

diff --git a/Administrator_Guide/Makefile b/Administrator_Guide/Makefile
index eeffdbb..524c797 100644
--- a/Administrator_Guide/Makefile
+++ b/Administrator_Guide/Makefile
@@ -2,6 +2,8 @@ PACKAGE = "Administrator_Guide"
 
 all: clean clean_ids
 	@publican build --langs=en-US --formats=html,html-single,pdf
+
+upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
 
 clean:
diff --git a/Deployment_Guide/Makefile b/Deployment_Guide/Makefile
index 1ec237d..4e3c7d0 100644
--- a/Deployment_Guide/Makefile
+++ b/Deployment_Guide/Makefile
@@ -2,6 +2,8 @@ PACKAGE = "Deployment_Guide"
 
 all: clean clean_ids
 	@publican build --langs=en-US --formats=html,html-single,pdf
+
+upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
 
 clean:
diff --git a/Development_Manual/Makefile b/Development_Manual/Makefile
index bef33ef..f27c571 100644
--- a/Development_Manual/Makefile
+++ b/Development_Manual/Makefile
@@ -2,6 +2,8 @@ PACKAGE = "Development_Manual"
 
 all: clean clean_ids
 	@publican build --langs=en-US --formats=html,html-single,pdf
+
+upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
 
 clean:
diff --git a/Installation_Guide/Makefile b/Installation_Guide/Makefile
index 9434d0e..d404559 100644
--- a/Installation_Guide/Makefile
+++ b/Installation_Guide/Makefile
@@ -4,6 +4,16 @@ all: 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; \
+		for format in html html-single pdf; do \
+			mv tmp/en-US/$$format tmp/$$(echo $${audience:0:1} | tr '[:lower:]' '[:upper:]')$${audience:1}_en-US_$$format; \
+		done; \
+	done
+	@sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
+
+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)/; \
 	done
 	@sed -r -i -e 's/^condition:.*/condition: community/g' publican.cfg
diff --git a/Release_Notes/Makefile b/Release_Notes/Makefile
index 4acee2c..74963a1 100644
--- a/Release_Notes/Makefile
+++ b/Release_Notes/Makefile
@@ -2,6 +2,8 @@ PACKAGE = "Release_Notes"
 
 all: clean clean_ids
 	@publican build --langs=en-US --formats=html,html-single,pdf
+
+upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
 
 clean:
diff --git a/Testing_Reference/Makefile b/Testing_Reference/Makefile
index 8f7516a..cfde688 100644
--- a/Testing_Reference/Makefile
+++ b/Testing_Reference/Makefile
@@ -2,6 +2,8 @@ PACKAGE = "Testing_Reference"
 
 all: clean clean_ids
 	@publican build --langs=en-US --formats=html,html-single,pdf
+
+upload: all
 	@rsync -aHvz tmp/en-US/{html,html-single,pdf} hosted.kolabsys.com:./public_html/kolab-2.3-docs/$(PACKAGE)/
 
 clean:





More information about the commits mailing list