From 8c89db5b0f55c3c888c765fa915d4e60e02d54d1 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 24 Oct 2011 19:52:01 +0200 Subject: sync modes: added refresh/one-way-from-local/remote (BMC #23537) The -from-client/server sync modes are confusing because the direction of the data exchange depends on which side acts as SyncML server or client. This patch introduces new modes which use -from-local/remote instead. The statistics and messages also use these variants now. The old modes are still understood, but are declared as "not recommended" in the documentation. --- README.rst | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'README.rst') diff --git a/README.rst b/README.rst index 4a51fe42..16bb95c0 100644 --- a/README.rst +++ b/README.rst @@ -415,9 +415,9 @@ the right database dumps for the selected sources. A restore tries to minimize the number of item changes (see section `Item Changes and Data Changes`_). This means that items that are identical before and after the change will not be transmitted anew to -the server during the next synchronization. If the server somehow -needs to get a clean copy of all items on the client then, use "--sync -refresh-from-client" in the next run. :: +the peer during the next synchronization. If the peer somehow +needs to get a clean copy of all local items, then use ``--sync +refresh-from-local`` in the next run. :: syncevolution --print-items syncevolution [--delimiter ] --export ||- [ ...] @@ -451,17 +451,12 @@ a list of valid values. --sync|-s |? Temporarily synchronize the active sources in that mode. Useful - for a `refresh-from-server` or `refresh-from-client` sync which + for a `refresh-from-local` or `refresh-from-remote` sync which clears all data at one end and copies all items from the other. - **Warning:** in local sync (`CalDAV and 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. + **Warning:** `local` is the data accessed via the sync config + directly and `remote` is the data on the peer, regardless + where the data is actually stored physically. --print-servers|--print-configs|--print-peers Prints the names of all configured peers to stdout. There is no -- cgit v1.2.3