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

Formatting fixes

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-21 18:53:09 +02:00
parent 811f378ece
commit cae0abe8c1
4 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docs/api.rst
View file

@ -11,17 +11,19 @@ General Section
--------------- ---------------
:: ::
[general] [general]
status_path = ... status_path = ...
#processes = 0 #processes = 0
- ``status_path``: A directory where vdirsyncer will store metadata for the - ``status_path``: A directory where vdirsyncer will store metadata for the
next sync. The data is needed to determine whether a new item means it has next sync. The data is needed to determine whether a new item means it has
been added on one side or deleted on the other. been added on one side or deleted on the other.
- ``processes``: Optional, defines the amount of maximal connections to use - ``processes``: Optional, defines the amount of maximal connections to use for
for syncing. By default there is no limit, which means vdirsyncer will try syncing. By default there is no limit, which means vdirsyncer will try to
to open a connection for each collection to be synced. The value ``0`` is open a connection for each collection to be synced. The value ``0`` is
ignored. Setting this to ``1`` will only synchronize one collection at a ignored. Setting this to ``1`` will only synchronize one collection at a
time. time.
@ -36,6 +38,7 @@ Pair Section
------------ ------------
:: ::
[pair pair_name] [pair pair_name]
a = ... a = ...
b = ... b = ...
@ -43,10 +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.
- ``conflict_resolution``: Optional, define how conflicts should be handled. - ``conflict_resolution``: Optional, define how conflicts should be handled. A
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 Valid values are ``a wins`` and ``b wins``. By default, vdirsyncer will show
show an error and abort the synchronization. an error and abort the synchronization.
.. _storage_config: .. _storage_config:
@ -54,6 +57,7 @@ Storage Section
--------------- ---------------
:: ::
[storage storage_name] [storage storage_name]
type = ... type = ...

1
vdirsyncer/storage/http.py
View file

@ -60,7 +60,6 @@ class HttpStorage(Storage):
A simple example:: A simple example::
# HTTP CALENDAR
[pair holidays] [pair holidays]
a = holidays_local a = holidays_local
b = holidays_remote b = holidays_remote