From 0735d09973c96bf4cef987c715155d2238c6d333 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 23 May 2014 15:15:19 +0200 Subject: [PATCH] Move documentation of parameter to right section --- docs/api.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 8ac93c8..22cd244 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -32,10 +32,6 @@ General Section Raspberry Pi is so slow that multiple connections don't help much, since the 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 Section @@ -50,6 +46,10 @@ Pair Section - ``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 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