thomas: server README.1st,1.23.2.6,1.23.2.7

[cvs at intevation.de]

Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv4834

Modified Files:
      Tag: kolab_2_0_branch
	README.1st 
Log Message:
Clarify version numbers.


Index: README.1st
===================================================================
RCS file: /kolabrepository/server/README.1st,v
retrieving revision 1.23.2.6
retrieving revision 1.23.2.7
diff -u -d -r1.23.2.6 -r1.23.2.7
--- README.1st	27 Sep 2005 08:34:22 -0000	1.23.2.6
+++ README.1st	27 Sep 2005 09:11:13 -0000	1.23.2.7
@@ -68,7 +68,7 @@
 the owner (usually "kolab").  The installation and configuration scripts
 should make sure that the permissions are correct but there's a chance
 that the permissions can still go wrong, especially if you upgrade from
-pre Beta 1 releases.
+pre 2.0beta1 releases.
 
 
 Upgrading from earlier versions
@@ -82,8 +82,8 @@
 configuration files are regenerated from your templates.
 
 
-Upgrade from versions older than Beta 1
----------------------------------------
+Upgrade from a 2.0 development snapshot to 2.0beta1
+---------------------------------------------------
 
 If you are running a development version of Kolab2, please make sure
 to remove the old package named kolab if you have this
@@ -100,13 +100,13 @@
 original names after upgrading.
 
 
-Upgrade from Beta 1
--------------------
+Upgrade from 2.0beta1 to 2.0beta2
+---------------------------------
 
-Between Beta 1 and Beta 2 the names the imap folders of global shared
+Between Beta1 and Beta2 the names the imap folders of global shared
 folders, i.e. those managed by the web admin interface, were changed.
 The prefix they use for the imap folders has changed from "user." to
-"shared." in Beta 2.  You can rename them with the cyradm tool.  First,
+"shared." in Beta2.  You can rename them with the cyradm tool.  First,
 login with cyradm (the imap server must be running for this):
 
 # /kolab/bin/cyradm --user manager localhost
@@ -129,8 +129,8 @@
 
 
 
-Upgrade from Beta2
-------------------
+Upgrade from 2.0beta2 to 2.0beta3
+---------------------------------
 
 The compile time options of apache and php have changed a little to
 enable multibyte strings.  Unfortunately, obmtool will not automatically
@@ -144,8 +144,8 @@
 rm /kolab/RPM/PKG/php-4*
 
 
-Upgrade from Beta3
-------------------
+Upgrade from 2.0beta3 to 2.0beta4
+---------------------------------
 
 Starting with Beta4, OpenLDAP is configured to use more indexes.  When
 upgrading from an earlier version of Kolab, these indexes need to be
@@ -159,8 +159,8 @@
 with a fully stopped server.
 
 
-Upgrade from Beta4
-------------------
+Upgrade from 2.0beta4 to 2.0beta5
+---------------------------------
 
 Beta5 has a new openldap package.  Installing this will replace one of
 its configuration files, /kolab/etc/openldap/slapd.conf, with a default
@@ -178,8 +178,8 @@
 able to log in to the web-admin interface.
 
 
-Upgrade from Beta5
-------------------
+Upgrade from 2.0beta5 to 2.0rc1
+-------------------------------
 
 Again, the openldap configuration has changed a bit.
 Rerun kolabconf and restart openldap.
@@ -189,8 +189,8 @@
 the email address of the distribution list.
 
 
-Upgrade from RC1
-----------------
+Upgrade from 2.0rc1 to 2.0rc2
+-----------------------------
 
 The openldap package has been updated.  For how to deal with an update
 of the openldap package, see the instructions for the upgrade from
@@ -200,21 +200,21 @@
 rebuilt as described for the update from Beta3.
 
 The mail attribute that was added to the distribution list entries in
-RC1 is now used to lookup the distribution list's ldap entry.
+2.0rc1 is now used to lookup the distribution list's ldap entry.
 Therefore, fixing the mail attribute as described for the upgrade from
 beta5 is important if you want your old distribution lists to work.
 
 
-Upgrade from RC2
-----------------
+Upgrade from 2.0rc2 to 2.0rc3
+-----------------------------
 
 clamav will send an email Warning with unresolved configuration file conflicts.
 In /kolab/etc/clamav/ you can safely delete clamd.conf.rpmsave
 and freshclam.conf.rpmsave. Later after starting the server run kolabconf once.
 
 
-Upgrade from RC3
-----------------
+Upgrade from 2.0rc3 to 2.0rc4
+-----------------------------
 
 Nothing special really, only a note to avoid confusion:  This release
 uses a new openpkg base package and it's normal that obmtool lists the
@@ -222,20 +222,20 @@
 initial install and is not required for an update.
 
 
-Upgrade from RC4
-----------------
+Upgrade from 2.0rc4 to 2.0
+--------------------------
 
 There's nothing special to be done.
 
 
-Upgrade from 2.0
-----------------
+Upgrade from 2.0 to 2.0.1rc1
+----------------------------
 
 Nothing special to be done for this update.
 
 
-Upgrade from 2.0.1rc1
----------------------
+Upgrade from 2.0.1rc1 to 2.0.1
+------------------------------
 
 If you upgrade from 2.0, there's nothing special to be done.  The rest
 of the notes for this release are only relevant when updating from