diff --git a/README.md b/README.md index a2fe368..1c250ea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -vdirsyncer syncronizes your CalDAV addressbooks and CalDAV calendars between +vdirsyncer synchronizes your CalDAV addressbooks and CalDAV calendars between two storages. The supported storages are CalDAV, CardDAV and [vdir](https://github.com/untitaker/vdir). diff --git a/config.example b/config.example index acb80a4..c68cb30 100644 --- a/config.example +++ b/config.example @@ -4,7 +4,7 @@ status_path=~/.vdirsyncer/status/ # CONTACTS [pair bob_contacts] -# This syncronizes only a single calendar/addressbook +# This synchronizes only a single calendar/addressbook a = bob_contacts_local b = bob_contacts_remote # conflict_resolution = None # abort when collisions occur @@ -40,9 +40,9 @@ url = https://owncloud.example.com/remote.php/caldav/calendars/bob/somecalendar/ username = # blabla password = # blabla -# Specify a time range which should be syncronized. Either both start_date and -# end_date or neither have to be set. The default is to syncronize everything. -# The following example syncronizes from one year in the past to one year in +# Specify a time range which should be synchronized. Either both start_date and +# end_date or neither have to be set. The default is to synchronize everything. +# The following example synchronizes from one year in the past to one year in # the future. # All Python expressions are allowed here. The global namespace contains diff --git a/vdirsyncer/cli.py b/vdirsyncer/cli.py index 0a2df18..1abdd79 100644 --- a/vdirsyncer/cli.py +++ b/vdirsyncer/cli.py @@ -132,7 +132,7 @@ def _main(env, file_cfg): @sync_command.main('[pairs...]') def sync_main(context, pairs=None): '''Syncronize the given pairs. If no pairs are given, all will be - syncronized.''' + synchronized.''' if pairs is None: pairs = list(all_pairs) actions = [] diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py index 5265b6f..ae73a55 100644 --- a/vdirsyncer/sync.py +++ b/vdirsyncer/sync.py @@ -4,10 +4,10 @@ ~~~~~~~~~~~~~~~ The function in `vdirsyncer.sync` can be called on two instances of - `Storage` to syncronize them. Due to the abstract API storage classes are + `Storage` to synchronize them. Due to the abstract API storage classes are implementing, the two given instances don't have to be of the same exact - type. This allows us not only to syncronize a local vdir with a CalDAV - server, but also syncronize two CalDAV servers or two local vdirs. + type. This allows us not only to synchronize a local vdir with a CalDAV + server, but also synchronize two CalDAV servers or two local vdirs. :copyright: (c) 2014 Markus Unterwaditzer :license: MIT, see LICENSE for more details.