diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-10-17 12:39:44 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-10-17 13:16:33 +0200 |
| commit | a7f7c8eacf8dd68cd620cd99c5d4cb632e352097 (patch) | |
| tree | 47e295827429d8f1e50e7ad62559160b6e1a2c28 /README.rst | |
| parent | 5c2e0c05036c8d148c4dc074b431465fdc860d7d (diff) | |
| parent | 1138f4fb7e7ddc61a4dddec99b7f2938f69b95e8 (diff) | |
Merge remote branch 'origin/syncevolution-1-2-branch'
Conflicts:
configure.ac
test/ClientTest.cpp
test/testcases/eds_event.ics.funambol.tem.patch
Conflicts because of version number and updated test cases resp. local
delete optimization.
ActiveSync backend had to be adapted to modified InsertItemResult: now
it requests a merge when it detects duplicates, like the CalDAV backend
already did on the 1.2 branch.
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -274,6 +274,15 @@ a list of valid values. for a `refresh-from-server` or `refresh-from-client` sync which clears all data at one end and copies all items from the other. + **Warning:** in local sync (CalDAV/CardDAV/ActiveSync, ...) and + direct sync with a phone, the sync is started by the side which acts + as server. Therefore the ``from-server`` variants + (``one-way-from-server``, ``refresh-from-server``) transfer data + from the sync config into the target config (see "Synchronization + beyond SyncML" below) resp. to a phone. The ``from-client`` variants + transfer in the other direction, even if the target config happens + to access data on a remote server. + --print-servers|--print-configs|--print-peers Prints the names of all configured peers to stdout. There is no difference between these options, the are just aliases. @@ -661,13 +670,6 @@ source in the target config. The ``sync`` property in the sync config defines the direction of the data flow. It can be set temporarily when starting a synchronzation with the sync config. - **Warning:** in local sync, the sync config side acts as - server. Therefore the ``from-server`` variants - (``one-way-from-server``, ``refresh-from-server``) transfer data - from the sync config into the target config. The ``from-client`` - variants transfer in the other direction, even if the target config - happens to access data on a remote server. - **Warning:** because the client in the local sync starts the sync, ``preventSlowSync=0`` must be set in the target config to have an effect. |