sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clarification of sync behavior

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-27 17:50:08 +02:00
parent cefaf4923a
commit a1f7c4cb00
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/api.rst
View file

@ -48,13 +48,14 @@ Pair Section
- ``collections``: Optional, a comma-separated list of collections to - ``collections``: Optional, a comma-separated list of collections to
synchronize. If this parameter is omitted, it is assumed the storages are synchronize. If this parameter is omitted, it is assumed the storages are
already directly pointing to one collection each. already directly pointing to one collection each. Specifying a collection
multiple times won't make vdirsyncer sync that collection more than once.
Furthermore, there are the special values ``from a`` and ``from b``, which Furthermore, there are the special values ``from a`` and ``from b``, which
tell vdirsyncer to try autodiscovery on a specific storage:: tell vdirsyncer to try autodiscovery on a specific storage::
collections = from b,foo,bar # all in storage b + "foo" + "bar" collections = from b,foo,bar # all in storage b + "foo" + "bar"
collections = from b,from a # all in both storages collections = from b,from a # all in storage a + all in storage b
- ``conflict_resolution``: Optional, define how conflicts should be handled. A - ``conflict_resolution``: Optional, define how conflicts should be handled. A
conflict occurs when one item changed on both sides since the last sync. conflict occurs when one item changed on both sides since the last sync.