diff --git a/sync.conf b/sync.conf index 7bd4e31..7c02a0d 100755 --- a/sync.conf +++ b/sync.conf @@ -34,7 +34,7 @@ RSYNC_EXCLUDE_PATTERN="" RSYNC_EXCLUDE_FROM="" #RSYNC_EXCLUDE_FROM="exclude.list" -## List elements separator char. You may set an alternative seperator char for your directories lists above. +## List elements separator char. You may set an alternative separator char for your directories lists above. PATH_SEPARATOR_CHAR=";" ## Generate an alert if master or slave replicas have less free space than given value in KB. @@ -98,7 +98,7 @@ CONFLICT_BACKUP_DAYS=30 ## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica. CONFLICT_PREVALANCE=master -## On deletition propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted +## On deletion propagation to the target replica, a backup of the deleted files can be kept. Deletions will be kept in .osync_workdir/deleted SOFT_DELETE=yes ## Osync will clean deleted files after a given number of days. Setting this to 0 will disable cleaning and keep deleted files forever. Warning: This can be very space consuming. SOFT_DELETE_DAYS=30 @@ -107,12 +107,12 @@ SOFT_DELETE_DAYS=30 ## Try to resume an aborted sync task RESUME_SYNC=yes -## Number maximum resume tries before initating a fresh sync. +## Number maximum resume tries before initiating a fresh sync. RESUME_TRY=2 -## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be carefull with this option if you have multiple masters. +## When a pidlock exists on slave replica that does not correspond to master's sync-id, force pidlock removal. Be careful with this option if you have multiple masters. FORCE_STRANGER_LOCK_RESUME=no -## Keep partial uploads that can be resumed on next run, experimantal feature +## Keep partial uploads that can be resumed on next run, experimental feature PARTIAL=no ## ---------- ALERT OPTIONS