fixxx

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,52 +1,44 @@
 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
@@ -54,24 +46,19 @@ 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
 
 *****************************************
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,16 +1,12 @@
 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
@@ -18,23 +14,24 @@ CONTENT:
 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 
@@ -50,25 +47,21 @@ II) If you want to sync with a device, where KO/Pi( or KA/Pi, PWM/Pi) is
        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).
@@ -200,62 +193,37 @@ 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" 
@@ -288,45 +256,31 @@ SYNC PREFERENCES:
  -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
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
@@ -25,23 +25,24 @@ B) Useful features, that are not straighforward to see
     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.