diff --git a/docs/tutorial.rst b/docs/tutorial.rst index e13bddf..6926957 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -62,13 +62,11 @@ might come. In vdirsyncer, synchronization is always done between two storages. Such storages are defined in :ref:`storage sections `, and which pairs of storages should actually be synchronized is defined in :ref:`pair -section `. +section `. This format is copied from OfflineIMAP, where storages +are called repositories and pairs are called accounts. -This format is copied from OfflineIMAP, where storages are called -repositories and pairs are called accounts. - -The following example synchronizes a single CardDAV-addressbook to -``~/.contacts/``:: +The following example synchronizes ownCloud's +default addressbook to ``~/.contacts/``:: [pair my_contacts] a = my_contacts_local @@ -85,6 +83,10 @@ The following example synchronizes a single CardDAV-addressbook to username = bob password = asdf +.. note:: + + Configuration for other servers can be found at :ref:`supported-servers`. + After running ``vdirsyncer sync``, ``~/.contacts/`` will contain a bunch of ``.vcf`` files which all contain a contact in ``VCARD`` format each. You can modify their content, add new ones and delete some [1]_, and your changes will be @@ -102,10 +104,10 @@ More Configuration Conflict resolution ------------------- -It almost seems like it could work. But what if the same item is changed on -both sides? What should vdirsyncer do? By default, it will show an ugly error -message, which is surely a way to avoid the problem. Another way to solve that -ambiguity is to add another line to the *pair* section:: +What if the same item is changed on both sides? What should vdirsyncer do? By +default, it will show an ugly error message, which is surely a way to avoid the +problem. Another way to solve that ambiguity is to add another line to the +*pair* section:: [pair my_contacts] ...