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

Move documentation of parameter to right section

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-23 15:15:19 +02:00
parent 1f85b4db6f
commit 0735d09973
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/api.rst
View file

@ -32,10 +32,6 @@ General Section
Raspberry Pi is so slow that multiple connections don't help much, since the Raspberry Pi is so slow that multiple connections don't help much, since the
CPU and not the network is the bottleneck. CPU and not the network is the bottleneck.
- ``collections``: Optional, a comma-separated list of collections to
synchronize. If this parameter is omitted, it is assumed the storages are
already directly pointing to one collection each.
.. _pair_config: .. _pair_config:
Pair Section Pair Section
@ -50,6 +46,10 @@ Pair Section
- ``a`` and ``b`` reference the storages to sync by their names. - ``a`` and ``b`` reference the storages to sync by their names.
- ``collections``: Optional, a comma-separated list of collections to
synchronize. If this parameter is omitted, it is assumed the storages are
already directly pointing to one collection each.
- ``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.
Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show