3 files changed, 37 insertions, 95 deletions

diff --git a/bin/kdepim/MultiSyncHowTo.txt b/bin/kdepim/MultiSyncHowTo.txt
index 3591eb9..05bd801 100644
--- a/bin/kdepim/MultiSyncHowTo.txt
+++ b/bin/kdepim/MultiSyncHowTo.txt
@@ -1,203 +1,190 @@
 Multi Sync HowTo 
 
-With KDE-Pim/Pi you can sync several devices 
-"in one go". That means you choose on one device
-(where everything is confgured in the right way)
-"Multiple Sync" and all devices will be synced.
-All devices must be reachable via network.
+With KDE-Pim/Pi you can sync several devices "in one go". That means you choose on one device (where everything is confgured in the right way) "Multiple Sync" and all devices will be synced. All devices must be reachable via network.
 
-In this HowTo we will give an explicit example what to set up
-and how configure.
+In this HowTo we will give an explicit example what to set up and how configure.
 
 We assume, that we have four devices which should be synced:
 A Sharp Zaurus PDA with KDE-Pim/Pi installed..
 A Windows laptop with KDE-Pim/Pi installed.
 A Linux Desktop with KDE installed.
 A Linux Laptop with KDE installed.
 
 NOTE: Your KDE version must be 3.3.0 or higher for sncing with.
       Please read KDE Sync HowTo how to update your SuSE 9.1 to KDE 3.3.x
       (KDE Sync HowTo is available in the help menu of KO/Pi and KA/Pi).
 
 The Zaurus is connected to the  Linux Desktop via USB cable.
 
-All calendar addressbook data should be synced with the other devices.
-That means in particular, that the calendar/address data of KDE on 
-the Linux laptop and desktop is synced with the other devices.
+All calendar addressbook data should be synced with the other devices. That means in particular, that the calendar/address data of KDE on the Linux laptop and desktop is synced with the other devices.
 
-First we have to install the needed programs, 
-then we have to configure the programs. 
+First we have to install the needed programs, then we have to configure the programs. 
 
 *****************************************
 (1) Installing the programs:
 *****************************************
 
 Download the files from
 http://sourceforge.net/projects/kdepimpi/
 project name KDE/Pim. 
 Download the latest release.
 You will find in every file a ReadMe, 
 where you can read how to install.
 (a) Installing KDE-Pim/Pi on the Windows laptop:
     Download file  kdepim_X.X.X_for_Windows.exe.zip
 (b) Installing KDE-Pim/Pi on the Linux laptop and desktop:
-    Download file KDE-Pim-Pi-1.9.10-SuSE9.1.i586.rpm.zip 
+    Download file KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm.zip 
 (c) Installing KDE-Pim/Pi on the Sharp Zaurus PDA:
     Depending on your Rom:
     Download file kdepim_X.X.X_for_SharpROM.ipk.zip
     or file kdepim_X.X.X_for_OZ-gcc3xx.ipk.zip for OpenZaurus users.
     If unsure, download kdepim_X.X.X_for_SharpROM.ipk.zip
 
 We assume that we have now on every device KDE-Pim/Pi installed.
 To learn more about syncing, please read now the
 Sync HowTo
 KDE Sync HowTo 
 available in the help menu of KO/Pi and KA/Pi.
 
 
 *****************************************
 (2) Configuring KDE-Pim/Pi for Multiple sync:
 *****************************************
 
-In mutiple sync, we have one aktive sync device and many
-other passive sync devices.
+In mutiple sync, we have one aktive sync device and many other passive sync devices.
 
-We use the Linux desktop as the active sync device.
-But there is no limitation. In general, you can choose 
-any device as active sync device. 
-The Zaurus is connected to the  Linux Desktop via USB cable.
-Please read the KDE Sync HowTo to know how to set up this connection.
+We use the Linux desktop as the active sync device. But there is no limitation. In general, you can choose any device as active sync device. The Zaurus is connected to the  Linux Desktop via USB cable. Please read the KDE Sync HowTo to know how to set up this connection.
 
 We assume, that the devices have the following IP numbers:
 Windows laptop: 192.168.0.40
 Linux laptop: 192.168.0.88
 Zaurus: 192.168.129.201
 Linux desktop: 192.168.0.99
 
 *****************************************
 (2a) Configuring the passive sync devices:
 *****************************************
 
 (i) Windows laptop: 192.168.0.40: Name: XP
 Start KO/Pi
 Choose menu: Synchronize - Enable PiSync
 Leave port as the default 9197.
 Choose password xyz.
 Click OK.
 
 (ii) Linux laptop: 192.168.0.88: Name: BUG
 Start KO/Pi
 Choose menu: Synchronize - Enable PiSync
 Leave port as the default 9197.
 Check the box "Automatically sync with KDE-Desktop when receiving sync request".
 Choose password xyz.
 Click OK.
 
 (iii) Zaurus: 192.168.129.201: Name: Z760
 Start KO/Pi
 Choose menu: Synchronize - Enable PiSync
 Leave port as the default 9197.
 Choose password xyz.
 Click OK.
 
 The configuration of the passive sync devices is done.
 
 *****************************************
 (2b) Configuring the aktive sync device:
 *****************************************
 
 Linux desktop: 192.168.0.99: Name: K7
 Start KO/Pi
 Choose menu: Synchronize - Configure...
 
 Set "Local device name" to "K7"
 
 Choose profile: KDE_Desktop
 Check "Include in multiple calendar sync".
 
 Create new profile.
 Set name from "noName" to "XP".
 Check "Include in multiple calendar sync".
 Set "Profile kind" to "Pi-sync".
 Set Calendar: Password for remote access to "xyz"
 Set Calendar: Remote IP address to "192.168.0.40"
 Do not change: Calendar: Remote port number
 
 Create new profile.
 Set name from "noName" to "BUG".
 Check "Include in multiple calendar sync".
 Set "Profile kind" to "Pi-sync".
 Set Calendar: Password for remote access to "xyz"
 Set Calendar: Remote IP address to "192.168.0.88"
 Do not change: Calendar: Remote port number
 
 
 Create new profile.
 Set name from "noName" to "Z760".
 Check "Include in multiple calendar sync".
 Set "Profile kind" to "Pi-sync".
 Set Calendar: Password for remote access to "xyz"
 Set Calendar: Remote IP address to "192.168.129.201"
 Do not change: Calendar: Remote port number
 
 Click on OK in the sync config dialog to save settings.
 
 
 *****************************************************
 3) Test Setup
 *****************************************************
 
 Choose menu: Synchronize - XP
 Now the Windows laptop should be syncronized.
 
 Choose menu: Synchronize - Z760
 Now the Zaurus should be syncronized.
 
 Choose menu: Synchronize - BUG 
 Now the Linux laptop (and KDE there) should be syncronized.
 
 Choose menu: Synchronize - KDE_Desktop
 Now KDE on the Linux desptop (your device you are syncing from) 
 should be syncronized with KO/Pi.
 
 
 *****************************************************
 4) Sync all devices
 *****************************************************
 
 Choose menu: Synchronize - Multiple Sync
 
 Watch the devices interchanging the calendar data ...
 
 Wait until you get the message in the KO/Pi header:
 
 4 profiles synced. Multiple sync complete!
 
 NOTE:
 If you want to test syncing, you may get wrong results, 
 if the clocks of the synced devices have too much difference.
 
 Example: Your clocks have a difference of 2 minutes.
 You sync.
 You edit an appointment on two devices.
 You sync again.
 You should get a conflict - but you do not get it.
 The reason is: On one device the "last modified" 
 datetime entry of the editet appointment is before the
 last sync event datetime on the local device.
 Such that the rule is:
 If you have a clock difference of X seconds, you may get
 wrong results, if you edit the same event within that
 X seconds on two devices.
 Same is valid for creating a new event, of course.
 If creation datetime is before the last sync, it is assumed that there was
 an existing event on the local device and the newly created remote
 event is deleted.
 
 
 *****************************************************
 5) Sync KA/Pi
 *****************************************************
 
 Setup KA/Pi in the same way like KO/Pi.
 
diff --git a/bin/kdepim/SyncHowto.txt b/bin/kdepim/SyncHowto.txt
index b0473a1..a901616 100644
--- a/bin/kdepim/SyncHowto.txt
+++ b/bin/kdepim/SyncHowto.txt
@@ -1,516 +1,470 @@
 WARNING:
-YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS, 
-IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM
-THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES
-HAVE TOO MUCH DIFFERENCE.
+YOU MAY GET UNEXPECTED (I.E. WRONG) SYNCHRONIZATION RESULTS, IF YOU CHANGE AN EVENT ON THE FIRST DEVICE AND SYNC IMMEDIATELY FROM THE OTHER DEVICE WITH THIS DEVICE, IF THE CLOCKS OF THE TWO DEVICES HAVE TOO MUCH DIFFERENCE.
 
-In other words: Please make sure, that the clocks of the devices 
-you want to sync have only a difference of some seconds!
+In other words: Please make sure, that the clocks of the devices you want to sync have only a difference of some seconds!
 
 
 CONTENT:
 
 0) How syncing works
 1) Qick overview of settings
 2) Sync settings in sync dialog
 3) Syncing background
 4) Sync preferences
 5) How a filter works
 6) Details about sync profile kinds
 
 *************************************************************************
 0) How syncing works
 *************************************************************************
 
 Note:
-The recommended and easiest way to syncronize two devices where 
-KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync".
+The recommended and easiest way to syncronize two devices where KO/Pi, KA/Pi or PWM/Pi is installed, is the profile kind "Pi-Sync".
 Details about that in 6) b).
 
-In KDE-Pim/Pi you can synchronize ( sync ) your calendar/addressbook/ 
-passwordfile with another calendar/addressbook/passwordfile,
-by syncing  your (local) calendar/addressbook/passwordfile 
+In KDE-Pim/Pi you can synchronize ( sync ) your 
+calendar/addressbook/passwordfile with another c
+alendar/addressbook/passwordfile,
+by syncing  your (local) 
+calendar/addressbook/passwordfile 
 with a (remote) file. 
 This remote file may on your local filesystem
 or on another (remote) device.
 
 If you want to sync with another remote device, you have to create
 a sync profile.
 You have two choices for choosing the profil kind:
 I)  You can choose profile kind "Remote file" and specify a 
     command line download/upload command ( like scp, ftp, ...) to 
     a) download the remote file to your local machine to a temp file
     b) sync with this temp file
     c) upload the synced file to the remote device
 II) If you want to sync with a device, where KO/Pi( or KA/Pi, PWM/Pi) is
     installed, you can easily get the remote file via network 
     with the build in file transfer feature:
     Choose profile kind "Pi-Sync" and
     a) Start KO/Pi,KA/Pi or PWM/Pi on remote device and
        enable "Pi-Sync" on remote device with password and port.
     b) Specify password, port and IP address in your profile.
 
 
 You can sync with your mobile phone as well.
 Everything is explained in more details below.
 
 NOTE:
-If you do not use profile kind "Pi-Sync",
-it is recommended to close 
-a running KO/Pi (KA/Pi, PWM/Pi) on the remote device.
+If you do not use profile kind "Pi-Sync", it is recommended to close a running KO/Pi (KA/Pi, PWM/Pi) on the remote device.
 (Note: KO/Pi(KA/Pi, PWM/Pi) running on Zaurus with 
 FastLoad enabled will never be closed!)
-After syncing with a running KO/Pi on the remote device,
-a "save" on the remote device will tell you that it needs to merge (sync).
-After merging (just a syncing with the changed file) 
-you will get the new data showing in remote KO/Pi. 
+After syncing with a running KO/Pi on the remote device, a "save" on the remote device will tell you that it needs to merge (sync).
+After merging (just a syncing with the changed file) you will get the new data showing in remote KO/Pi. 
 
 *************************************************************************
 1) Qick overview of settings
 *************************************************************************
 
 a) Open sync settings dialog (Menu Synchronize - Configure...)
 b) Give your device a unique name.
    (unique in the set of all devices you want to sync with).
    If you have already configured another devive and created 
    there a sync profile to sync with this device, give your device
    the same name as this sync profile! The same name is important, 
    because it makes it possible to sync first A->B 
    (A local device, that performs the sync, B remote device) 
    and then B->A. Such that the B->A sync knows about the 
    already performed A->B sync.
    That means: It is unimportant if you sync A->B or B->A,
    the devices A and B will be synced properly. 
 c) Create a new sync profile and give it a unique name.
    (unique in the set of all sync profiles on this device).
    If you want to sync with a device, where KO/Pi is already installed
    and which has a given unique device name, use this device name as
    your profile name ( refer to b) ).
 d) Choose the profile kind of your syncing method:
       (i) Local file or
      (ii) Pi-Sync or
     (iii) Remote file or
    (iiii) Mobile Phone.
    Detailed explanation in 6) 
 e) Choose the other profile options.
    Detailed explanation in 2) 
 f) Close sync dialog with OK.
 g) Sync.
 
 NOTE:
 AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED 
 (OR UPDATED, IF IT ALREADY EXITS) FOR EACH SYNC PROFILE.
 YOU MAY NOT DELETE OR CHANGE THESE EVENTS. 
 
 *************************************************************************
 2) Sync settings in sync dialog
 *************************************************************************
 
 a) Local device name:
    -> 1) b)
 b) Profile:
    -> 1) c)
 c) Multiple Sync options: Include in multiple sync:
    In the Synchronize menu, there is a multiple sync menu entry.
    If you choose this menu entry, all user defined profiles with this
    'Include in multiple sync' option enabled will be  synced 
    one after another. And this twice. This will take some time.
    After that sync, on all devices should be the same data.
 
 d)- j) Sync algo options:
 
 d) Ask for preferences before sync:
    Check this to be asked for "Sync preferences" settings before each sync.
    If the profile kind is "Pi-Sync" you will be asked to confirm
    the "Pi-Sync" specific settings (Password,IP address, port number)
    as well. That makes it possible to use that profile for a
    device that is connected via DHCP to the network and gets different
    IP addresses when connecting to the network.
 e) Sync preferences:
    Choose here your sync preferences.
    Details -> 4)
 f) Show summary after sync:
    Check this to get a small summary dialog after sync 
    about number of added/changed/deleted events on local/remote.
 g) Apply filter when adding data to local:
    What is a filter? You can read this in -> 5)
    With this option you can specify a filter for events/contacts, 
    which should be added to the local database, because they are
    in the remote database and not in the local database.
    (Database = calendar file or addressbook file).
    Note that the filter is NOT applied to the remote
    database before syncing. It is only applied to a particular
    item which should be added to the local database.
    Well, but what is the difference?
    The differnce is: If the remote database AND the local database contain
    an already synced item, which does not match the filter, then this item is synced.
    If the remote database contains an item which does not match the filter
    and the local database does not contain this item, then this item is not added
    to the local database, but it is still in the remote database after syncing.
 g) Write back synced data:
    Uncheck this to update the local calendar only.
    I.e. your local calendar is synced with the remote calendar
    but nothing on the remote calendar is changed.
    If you uncheck "Write back synced data", the settings
    under h) and i) are ignored, of course.
 
 h) - j) Write back options:
 
 h) Write back (on remote) existing entries only:
    Check this to update the remote data only.
    I.e. no data from yor local calendar/addressbook is added to the
    remote device. You may use this option to 
    sync against some kind of "public calendar/addressbook" without 
    adding anything of your personal data.
    But in this case, you cannot add an item to the remoet device.
 i) Apply filter when adding data to remote:
    What is a filter? You can read this in -> 5)
    With this option you can specify a filter for events/contacts, 
    which should be added to the remote database, because they are
    in the local database and not in the remote database.
    (Database = calendar file or addressbook file).
    Note that the filter is NOT applied to the local
    database before syncing. It is only applied to a particular
    item of the local database which should be added to the remote database.
    Well, but what is the difference?
    The differnce is: If the local database AND the remote database contain
    an already synced item, which does not match the filter, then this item is synced.
    If the local database contains an item which does not match the filter
    and the remote database does not contain this item, then this item is not added
    to the remote database, but it is still in the local database after syncing.
    Example:
      You have specified a calendar filter "only public events".
      You specify this filter as the outgoing filter for syncing.
      If there is an event in the local database which is not "public", but "private",
      this event is not added to the remote database.
      If there is an event in the local database and in the remote database which is
      "private" (maybe added by someone else) then this event is synced and 
      it is in the local database and in the remote database after syncing.
      That means in particular you cannot remove an event from the remote
      database but setting it to "private". 
      If you want to remove the event you can clone it, set it to private and delete the
      original event. Then the original event is deleted in the remote database after sync and
      the cloned event is not added to the remote database, because it is private.
 j) Write back (calendar) entries for time period only:
    Check this to write back only calendar entries for a given time period.
    (Useful when syncing with mobile phones.)
    You can specify the date range in weeks for the weeks in the past to the weeks in the future.
 
 k) Profile kind:
    Details -> 6)
 
 *************************************************************************
 3) Syncing background
 *************************************************************************
 
 The same mentioned for calendars is valid for addressbooks as well.
 
-Synchronizing calendars ( i.e. files ) means, 
-to merge two calendars in a useful way.
-If the two calendars are completely different, 
-there is no problem, the resulting calendar contains 
-all data from the local and from the remote calendar.
-
-Problems will occur, if you have edited items 
-from the local calendar on the remote machine. 
-Then it could be, that items are in conflict. 
-Two items are "in conflict", if they have the 
-same unique ID (which get an item at time of 
-creation and owns it until it is deleted )
-and they both are modified after the last 
-synchronization.
-
-At first sync of two calendars there is no item deleted. 
-If the calendars are synced before and there is an item, 
-which is not edited after the last sync and is only 
-available in one calendar, then this item is deleted 
-in this calendar.
+Synchronizing calendars ( i.e. files ) means, to merge two calendars in a useful way. If the two calendars are completely different, there is no problem, the resulting calendar contains all data from the local and from the remote calendar.
+
+Problems will occur, if you have edited items from the local calendar on the remote machine. Then it could be, that items are in conflict. Two items are "in conflict", if they have the same unique ID (which get an item at time of creation and owns it until it is deleted ) and they both are modified after the last synchronization.
+
+At first sync of two calendars there is no item deleted. If the calendars are synced before and there is an item, which is not edited after the last sync and is only available in one calendar, then this item is deleted in this calendar.
 
 But when was the last synchronization between two calendars?
 
-To know that, KO/Pi creates at first syncing 
-of two files an unique event "<profile name> - sync Event" 
-on the remote and the local calendar. 
-After syncing, the start time of this event is set 
-to the time of syncing. 
-The event is read only and the user may not change it.
+To know that, KO/Pi creates at first syncing of two files an unique event "<profile name> - sync Event" on the remote and the local calendar. After syncing, the start time of this event is set to the time of syncing. The event is read only and the user may not change it.
 
-If two such files are synced, that both have an event 
-"<profile name> - sync Event" and the events have 
-the same start time, then deleted items on the one calendar 
-are deleted on the other as well.
+If two such files are synced, that both have an event "<profile name> - sync Event" and the events have the same start time, then deleted items on the one calendar are deleted on the other as well.
 
 
 *************************************************************************
 4) Sync preferences
 *************************************************************************
 
-Two items are "in conflict", if they have the same unique ID 
-and they both are  modified after the last synchronization.
+Two items are "in conflict", if they have the same unique ID and they both are  modified after the last synchronization.
 (Details -> 3) ).
 
-If an item is not modified after the last sync and 
-it is not found in the other calendar, it is deleted.
+If an item is not modified after the last sync and it is not found in the other calendar, it is deleted.
 
 On the first sync, there is no item deleted.
 
 SYNC PREFERENCES:
  -Take local entry on conflict:
   Takes the local entry on conflict. 
   If it is the first sync, 
   "Ask for every entry" 
   is chosen automatically, 
   if this is selected.
 
  -Take remote entry on conflict:
   Takes the remote entry on conflict. 
   If it is the first sync, 
   "Ask for every entry" 
   is chosen automatically, 
   if this is selected.
 
  -Take newest entry on conflict:
   This takes the newest entry on conflict. 
   May be the most useful syncing mode.
 
  -Ask for every entry on conflict:
   Pops up an event viewer dialog and 
   shows the two conflicting entries there. 
   The user can chose, which entry he would like to take.
   The button for the newest entry 
   is automatically set as default button.
   The color for the newest entry is green.
 
  -Force: Take local entry always:
   Even if the calendars are already synced
   there is no item deleted on local. 
 
  -Force: Take remote entry always:
   Analogous to  
   "Force: Take local entry always"
 
 *************************************************************************
 5) How a filter works
 *************************************************************************
 
-A filter is a rule to decide if a particular item
-(calendar iten item or contact item) belongs to a set of items.
+A filter is a rule to decide if a particular item (calendar iten item or contact item) belongs to a set of items.
 For example, you can specify a set as:
 Only items, that belongs to that category.
 Or: Only items, that does not belong to that category.
 Or: Only items, that are public.
 
-If you specify a filter in a syncing profile, you can set the
-rules of adding items to the local or remote database.
+If you specify a filter in a syncing profile, you can set the rules of adding items to the local or remote database.
 
 Example:
-You have a public calendar in your company, which contains all
-company relevant data.
-
-You have different projects in the company and for project specific events
-is always set the project name as a category: 
-E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC.
-But you are not interested in events of PRO_ABC, because you are not working on it.
-Then you can specify a filter: All, but not with categoroy PRO_ABC.
-When you specify this filter as an incoming filter for your sync profile,
-all events of the company are synced and added to your local calendar, but not
-the evenst of the project PRO_ABC.
-
-You do not want that your private data can be seen 
-in the public calendar of your company.
-Well, set the property to "private" for all your private data 
-and specify an outgoing filter: Only " public" and "confidential".
-Then you can sync your personal calendar with the calendar of the company,
-but your private data is not added to the public calendar. 
+You have a public calendar in your company, which contains all company relevant data.
+
+You have different projects in the company and for project specific events is always set the project name as a category: 
+E.g. all events of the project PRO_ABC do have set the categorie PRO_ABC. But you are not interested in events of PRO_ABC, because you are not working on it. Then you can specify a filter: All, but not with categoroy PRO_ABC. When you specify this filter as an incoming filter for your sync profile, all events of the company are synced and added to your local calendar, but not the evenst of the project PRO_ABC.
+
+You do not want that your private data can be seen in the public calendar of your company. Well, set the property to "private" for all your private data and specify an outgoing filter: Only " public" and "confidential". Then you can sync your personal calendar with the calendar of the company, but your private data is not added to the public calendar. 
  
 *************************************************************************
 6) Details about sync profile kinds
 *************************************************************************
 
 a) Local file
    Please specify a local file you want to sync with.
    Note:  If you are syncing a file, which is used by KA/Pi, please check the
           "Addressbook file (*.vcf) is used by KA/Pi".
           If you are syncing with a file from KAddressbook or another program, 
           please uncheck "Addressbook file (*.vcf) is used by KA/Pi".
           To set this properly is important! KA/Pi uses a "last modified" property, 
           which is not supported by KAddressbook.
 
 b) Pi-Sync (direct Kx/Pi to Kx/Pi sync)
    We mention here only KO/Pi, but the same is valid for KA/Pi.
    If you want to sync with a device, where KO/Pi is
    installed, you can easily get the remote file via network 
    with the build in file transfer feature "Pi-Sync":
    You have first to enable file transfer on the remote device:
    - Start KO/Pi on the remote device.
    - Choose Menu Synchronize-Enable Pi-Sync.
    - Choose a port number, where KO/Pi should listen for 
      file sending requests. Valid port numbers are numbers
      between 1 and 65565. Do not specify port numbers, that are
      used by other applications. A port number between 9000 and 9999
      is most likely not used by another application.
      The default port number is 9197 for KO/Pi.
      If you specify a port number, which is already in use,
      you will get an error message when closing this dialog.
    - Choose a password.
    - Click OK.
      Now KO/Pi will send the calendar data via the network, 
      if some other device is sending a "please send calendar"
      request on the given port using the given password.
      If you want to be sure, nobody can access your calendar
      data, simply disable the file transfer feature on the 
      remote device after the syncing is done by choosing:
      Menu Synchronize-Disable Pi-Sync.
 
    Note: If you want to sync with a remote device that gets different 
          IPaddresses each time connected to the network
          (this may be the case, if you use DHCP for connection 
          of the remote device to the network) simply enable
          "Ask for preferences before sync".  
          Then you will be asked to confirm the
          "Pi-Sync" specific settings 
          (Password,IP address, port number)
          and you can easily change the IP address before each sync.
 
    On your local device, create a new profile and choose
    profile kind "Pi-Sync".
    Fill in the needed values:
    - Password for remote access:
      The password you specified on the remote device.
    - Remote IP address:
      The IP address of the remote device.
    - Remote port number:
      The port number you specified on the remote device.
    
    Now you can syncronize your local device easily with your 
    remote device. This works well for all platforms KO/Pi is 
    running on, e.g. syncing a KO/Pi on Zaurus with KO/Pi on Windows
    is now very easy.  
 
 c) Remote file
    Note:  If you are syncing a file, which is used by KA/Pi, please check the
           "Addressbook file (*.vcf) is used by KA/Pi".
           If you are syncing with a file from KAddressbook or another program, 
           please uncheck "Addressbook file (*.vcf) is used by KA/Pi".
           To set this properly is important! KA/Pi uses a "last modified" property, 
           which is not supported by KAddressbook.
 
    Syncing with the profile kind "Remote file" is performed in three steps:
    i) download the remote file to your local machine to a temp file
    ii) sync with this temp file
    iii) upload the synced file to the remote device
 
    The down-/uploading if i) and iii) is done via a command line command.
    Please specify the download/upload command ( like scp, ftp, ...) and the
    file name of the temp file in the corresponding fields.  
 
 d) Mobile device (cell phone)
    Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package
          to be able to access mobile phones.
    We mention here only KO/Pi, but the same is valid for KA/Pi.
    Note:
    It is only possible to sync a mobile phone with one particular device
    running KO/Pi. If you want to be able to write data of more than one device
    to the mobile phone (e.g. from your Zaurus and from your Windows Laptop)
    do not sync with the mobile phone at all, but use the 
    "Export to phone" functionality from the different devices.
    Using "Export to phone" makes it not possible to get back data from the
    phone, if it was changed there, of course.
    If you sync with the phone, do not use "Export to phone" from any device.
    (And do not sync, as mentioned above, from any other device with that phone). 
    It would delete the needed information for syncing with that phone!
 
    We are using Gammu (Version: 0.98.9) ( http://freshmeat.net/projects/gammu/ ) 
    for accessing the phones. 
    Note: You cannot use the original Gammu for syncing KDE-Pim/Pi, because 
    we have modified the original version to make it useable for syncing!
    Gammu allows access to many phones in many ways (Irda, Bluetooth, serial,...).
    The recommended phone access using Gammu with KDE-Pim/Pi is Irda (infrared).
    Bluetooth access is disabled on the Zaurus, but may work on Windows.
    Please look at the Gammu homepage and documentation about more details 
    configuring Gammu how to access your phone.
    If you have problems accessing your phone, start KO/Pi from the konsole
    and you will get a more detailed output what went wrong.
    About Gammu from the Gammu homepage:
        Gammu (formerly known as MyGnokii2) is a cellular 
        manager for various mobile phones/modems. 
        It supports the Nokia 2100, 3100, 32xx, 33xx, 
        3410, 35xx, 51xx, 5210, 5510, 61xx, 62xx,
        63xx, 6510, 6610, 6800, 71xx, 7210, 7250, 
        7250i, 82xx, 83xx, 8910, 9110, 9210 
        and compatible and AT devices (Siemens, Alcatel, 
        Falcom, WaveCom, IPAQ, Samsung, SE, and others) 
        over cables/infrared/BlueTooth.
    
    Here is an example what to specify to access a Nokia 6310i via infrared:
    On Linux (Zaurus):
      I/O device: /dev/ircomm
      Connection: irda
      Model: <leave empty>
    
    On Windows:
      I/O device: <ignored - i.e. leave empty>
      Connection: irda
      Model: <leave empty>
 
    Here is the overview from the Gammu documentation, 
    how to specify the connection settings  for
      I/O device: 
      Connection: 
      Model:
  
    Note: The documentation uses the term "port", 
          where we use the term "I/O device".
    Note: You do not have to create/change the gammurc configuration file.
          That will do KO/Pi for you.  
    Note: For a known model, leave "Model:" always empty, 
          such that Gammu can auto detect the model.
 
 # This is a sample ~/.gammurc file.
 # In Unix/Linux  copy it into your home directory and name it .gammurc
 #                or into /etc and name it gammurc
 # In Win32       copy it into directory with Gammu.exe and name gammurc
 # More about parameters later
 # -----------------------------------------------------------------------------
 
 [gammu]
 
 port = com8:
 #model = 6110
 connection = fbusblue
 #synchronizetime = yes
 #logfile = gammulog
 #logformat = textall
 #use_locking = yes
 #gammuloc = locfile
 #startinfo = yes
 #gammucoding = utf8
 
 [gammu1]
 
 port = com8:
 #model = 6110
 connection = fbusblue
 #synchronizetime = yes
 #logfile = gammulog
 #logformat = textall
 #use_locking = yes
 #gammuloc = locfile
 #startinfo = yes
 #gammucoding = utf8
 
 # -----------------------------------------------------------------------------
 # Now info about "Connection" parameter and connected with it port type
 # (more about port types later)
 # -----------------------------------------------------------------------------
 # "Connection" parameter | Port type | More details
 # -----------------------|-----------|-----------------------------------------
 # "fbus"                 | serial    | Nokia FBUS2
 # "fbusirda"/"infrared"  | serial    | Nokia FBUS2 over direct infrared device
 # "fbusdlr3"/"dlr3"      | serial    | Nokia FBUS2 with DLR3 cable
 # "fbusdku5"             | dku5      | Nokia FBUS2 with DKU5 cable. WIN32 ONLY
 # "fbuspl2303"           | usb       | Nokia FBUS2 with USB cable based on
 #                        |           | PL2303 chip.
 # "fbusblue"             | serial    | Nokia FBUS2 over Bluetooth serial device
 # "phonetblue"           | serial    | Nokia PHONET FBUS over Bluetooth serial
 #                        |           | device
diff --git a/bin/kdepim/korganizer/featuresKOPI.txt b/bin/kdepim/korganizer/featuresKOPI.txt
index dc10a6b..283ec8e 100644
--- a/bin/kdepim/korganizer/featuresKOPI.txt
+++ b/bin/kdepim/korganizer/featuresKOPI.txt
@@ -1,231 +1,232 @@
 Features of KO/Pi and hints for usage of KO/Pi
 (www.pi-sync.net)
 
 A) General features
     0) Main features
     1) Import - export - connection - syncing
     2) Filter
     3) Managing categories:
     4) Cancelling of items:
     5) Addressbook access:
     6) Quick editing:
     7) Fast navigation:
     8) Printing:
     9) Configuration:
    10) Language:
    11) Alarm:
    12) What'sThis Help:
 
 B) Useful features, that are not straighforward to see
     1) Right mouse click on Zaurus
     2) Moving of items in the agenda view
     3) Creating exceptions for recurring events
     4) Navigation in month view
     5) Navigation in agenda view
     6) Monthview as week view
     7) Switching display mode in date edit
     8) Recurring todos
 
 
 ******************************************************
 A) General features
 ******************************************************
-Features of KO/Pi 1.9.12:
+Features of KO/Pi 2.0.8:
 0)
 Main features:
 KO/Pi makes synchronizing your data easy!
 Details in 1) and the sync HowTos.
 With KO/Pi you can manage your events/todos/journals.
 Todos may have subtodos.
+Todos may recur ( details: B)8) Recurring todos)
 A subtodo can be changed to a parent root todo.
 A (sub)todo can be reparented to make it a subtodo of another todo.
 KO/Pi has a monthview, a What's Next view, an event list view, a small and big todo-view and an agenda view to display 1-42 days.
 KO/Pi is Qt-only based and runs on Sharp Zaurus PDA, Linux and Windows.
 1) 
 Import - export - connection - syncing:
 KO/Pi on Windows can import calendar data easyly from Outlook directly via OLE.
   Recurring events with exceptions and attendee lists of meetings are imported properly.
 KO/Pi can import/export ics and vcs files.
 KO/Pi can save/load ics backup files.
 KO/Pi can send ics and vcs files via infrared, with and without timezone settings.( Zaurus only )
 KO/Pi can receive files via infrared directly, after beam receive is enabled.( Zaurus only )
   Via the search function you can send any number/selection of events/tasks/journal via infrared.
 Via the search function you can export and save any number/selection of events/tasks/journal to an ics file.
 Via the search function you can export and save any number/selection of journals and descriptions of events/todos to a plain text file.
 KO/Pi can import xml calendar/todo data from Opie/old Qtopia environment.
 KO/Pi can sync calendar/todo data with new Sharp Rom DTM model PIM applications, found on Zaurus 7x0/860 and Sharp Rom 3.1 (and above) for 5x00 series.
 (Hint: Rename  /home/QtPalmtop/bin/datebook to e.g. /home/QtPalmtop/bin/datebookwech
 to prevent alarm notification by the Sharp calendar app)
 KO/Pi can sync calendar/todo/journal data with any local ics file. 
 In KO/Pi you can create a specific profile for each device to sync with.
   KO/Pi can automatically down/upload a remote ics file to a temp file via user specified system command (e.g. ssh/scp, ftp, ...) to sync with.
   KO/Pi can ask you, if a conflict while syncing is detected and displays a detailed view of both events/todos. 
   Multiple sync with many profiles at once is supported. Read "Multi Sync HowTo".
   KO/Pi can sync after an easy and quick setup via network in the "Pi-Sync" mode with another running instance of KO/Pi with "Pi-Sync" enabled. 
   KO/Pi on Linux can sync with KDE calendar data. 
   KO/Pi on the Zaurus can sync with KDE calendar data on desktop via Pi-Sync. Read "KDE-Sync HowTo".
   KO/Pi can sync and export data to mobile phones. Supported models are depending of the used lib, libgammu.
   If KO/Pi detects that the saved file on disk has changed,(e.g. a remote sync from somewhere has happened),
     it asks you, if you want to overwrite the file or if you want to sync with the file. Such that no data is lost.
 KO/Pi can save/load templates for events/todos.
 2)
 Filter:
 You can define filters for displaying/not displaying specified categories.
 Quick access to the first 20 filters via hotkeys 1-0 and <ctrl>1-0
 3)
 Managing categories:
 After importing/loading/syncing there may be new categories in events or todos which are not in the category list.
   You can choose what to do with these categories: 
   -Add to category list
   -Or remove them from events/todos
 In the list view/search dialog you can quickly assign categories to all selected items.
   You can choose
   -to add a selection of categories to the list of categories
   -to set a selection of categories as the new list of categories
 You can specify a color to every categorie.
   The events/tasks of this categorie are  displayed with this color in the agenda view.
   You can configure, if the events/tasks categorie color is shown in todo view/month view as well.
 4)
 Cancelling of items:
 You can cancel an event/todo without deleting them.
 The cancelled event/todo is then displayed stricked out.
 5)
 Addressbook access:
 You can access address entries stored in KA/Pi. 
 You cam import birtdays from KA/Pi.
 In KA/Pi you can configure a new resource to get read-only acces to Opie addressbook data.
 6)
 Quick editing:
 You can quickly clone, move, cancel, beam events/todos.
 When dragging a recurrent event in agenda view, this recurrence is automatically added to the list of recurrence exceptions and a non-recurring clone is created.
 If you click on a day number in month view, a new edit event dialog pops up.
 7)
 Fast navigation:
 There are many shortcuts for fast changing the view. Please refer to shortcut-key description.
 If you click on the week number in month view, this week is shown in agenda view.
 8)
 Printing:
 On the desktop version, you can print out a vertical range of the agenda view "as you see it".
 And you can print on the desktop version a day view, three kinds of a week view and a month view. 
 You can print the todo list as well.
 9)
 Configuration:
 There are many advanced configuration possibilities.
 You can configure for every item in the toolbar, whether it should be shown or not.
 There are two item sizes for toolbar icons available. (Useful for 5x00 user and small display).
 You can configure the font/fontsize for every view.
 10)
 Language:
 KO/Pi is available in English, German, French and Italian.
 11)
 Alarm:
 For Zaurus there is an alarm applet available with additional timer functionality.
 This alarm applet will make the Zaurus wake up, if the device is in suspend mode.
 On the desktop (e.g. Windows) you can enable in KO/Pi the internal alarm notification, 
 such that you are informed about an alarm, if the program is running.
 12)
 What'sThis Help:
 To use the What'sThis Help, you have to enable the What'sThis icon in the toolbar.
 (Choose menu: ME-Toolbar or Action-Configure Toolbar ).
 (You have to restart to reload the changed toolbar config).
 Now click on the QWhat'sThis Icon 
 in the top right corner of KO/Pi.
 Then click now after that on an item in the Agenda View or in the month view
 you will get a detailed display of the items content.
 
 
 
 ******************************************************
 B) Useful features, that are not straighforward to see
 ******************************************************
 
 1) Right mouse click on Zaurus
 2) Moving of items in the agenda view
 3) Creating exceptions for recurring events
 4) Navigation in month view
 5) Navigation in agenda view
 6) Monthview as week view
 7) Switching display mode in date edit
 8) Recurring todos
 
 1) 
 Right mouse click on Zaurus:
 In KO/Pi on the desktop a right mouse click will popup an menu on some items.
 On the Zaurus there can only the stylus be used.
 To simulte a right mouse click with the stylus press is and hold it down
 for 1-2 seconds. If you release it then, a menu pops up, if there is
 a menu available for this particular item.
 On some places the menu pops up without releasing the stylus.
 That bevaviour is not a bug, it is caused by the the behaviour of the
 single left click on the item.
 
 2)
 Moving of items in the agenda view:
 In the agenda view you can move an item by clicking on it and holding
 the mouse down.
 You have to move the mouse some distance before the items actually 
 starts to move. That is not abug, that is a feature to prevent
 you to make unwanted moves of the item when you click on it(and moving the
 mouse only a small distance with this click)
 
 3)
 Creating exceptions for recurring events:
 To create an exception for a recurring event,
 move this event in the agenda view. 
 This recurrence is automatically added to the list 
 of recurrence exceptions and a non-recurring clone is created.
 To cancel a single recurrence, create an exception by moving it
 and then move it back and cancel it.
 
 4) 
 Navigation in month view:
 If you select the month view with the icon in the toolbar,
 the selected data range in the date navigator
 is set automatically to the complete month. 
 (Click on month view and then the space bar to see the 
 selected data range in the date navigator).
 If you select in the data navigator
 (automatically by clicking on the month view or manually)
 a date range from the first of the month to the
 28.-31. of the month (the 28.-31. is valid for every month!)
 then the (month-)navigation keys will select automatically the
 complete next month as date range.
 
 5)
 Navigation in agenda view:
 If you select (as an example) 4 days in the date navigator
 the (week-) navigation key will select the same 4 days in the next week.
 If you want to get the next 4 days after the selected 4 days selected,
 you have to switch the navigation mode to "next days mode" 
 by clicking on the next days icons.
 Now the next days from today are selected, but after selecting
 4 days in the day navigator the (week-) navigation key 
 will select the next 4 days.
 The "next days mode" is turned off by clicking on the
 week view, work week view or day view button.
 The agenda view has "time labels" on the left, which displays the hours from 0-24.
 If you press the mouse on the timelabels and move it up/down you can 
 increase/decrease the agenda size quickly. 
     In the agenda view you can click on the day labels (e.g. Mon 14)
 to see the selected date in single day mode. 
 If you click in single day mode the day label you will switch back to
 the previously selected date range.
 Right of the day labels is a ">" button.
 If you click this button, you will go one day ahead.
 Left of the day labels is the month name displayed.
 If you click this button, the month view is shown. 
 
 6) 
 Monthview as week view:
 On the left side of the monthview are the week number labels displayed.
 If you click on these labels, the month view will show this week zoomed.
 To go back to monthly view click the left label again.
 You can quickly select a week number by clicking the black triangle
 on top of the week number labels.
 
 7) 
 Switching display mode in date edit:
 On several places is a date edit used.
 You can scroll the dates by selecting the part of the date (month, day, year)
 in the lineedit and pressing the key up/key down key.
 The display mode of a date edit is initially short date mode.