Fixed paths according to new dev version

sync.conf

@@ -1,19 +1,23 @@
 #!/usr/bin/env bash
 
 ###### Osync - Rsync based two way sync engine with fault tolerance
-###### (L) 2013-2014 by Orsiris "Ozy" de Jong (www.netpower.fr)
-###### Config file rev 2015070201
+###### (L) 2013-2015 by Orsiris "Ozy" de Jong (www.netpower.fr)
+###### Config file rev 2015091201
 
 ## ---------- GENERAL OPTIONS
 
 ## Sync job identification
 SYNC_ID="sync_test"
 
-## Directories to synchronize. Master must be on the system Osync runs on. Slave can be either a local directory, or a remote one.
-MASTER_SYNC_DIR="/home/git/osync/dir1"
-SLAVE_SYNC_DIR="/home/git/osync/dir2"
-#SLAVE_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
-## If slave replica is a remote directory, you must specify a RSA key (please use full path). Please see documentation for further information.
+## Directories to synchronize.
+## Initiator is the system osync runs on. The initiator directory must be a local path.
+INITIATOR_SYNC_DIR="/home/git/osync/dir1"
+
+## Target is the system osync synchronizes to (can be the same system as the initiator in case of local sync tasks). The target directory can be a local or remote path.
+TARGET_SYNC_DIR="/home/git/osync/dir2"
+#TARGET_SYNC_DIR="ssh://backupuser@yourhost.old:22//home/git/osync/dir2"
+
+## If the target system is remote, you can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
 SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
 
 ## Create sync directories if they do not exist
@@ -37,7 +41,7 @@ RSYNC_EXCLUDE_FROM=""
 ## 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.
+## Generate an alert if initiator or target replicas have less free space than given value in KB.
 MINIMUM_SPACE=10240
 
 ## Bandwidth limit Kbytes / second. Leave 0 to disable limitation
@@ -78,7 +82,7 @@ PRESERVE_HARDLINKS=no
 ## Do a full checksum on all files that have identical sizes, they are checksummed to see if they actually are identical. This can take a long time.
 CHECKSUM=no
 
-## Let RSYNC compress file transfers. Do not use this if both master and slave replicas are on local system. Also,  do not use this if you already enabled SSH compression.
+## Let RSYNC compress file transfers. Do not use this if both initator and target replicas are on local system. Also,  do not use this if you already enabled SSH compression.
 RSYNC_COMPRESS=yes
 
 ## Maximum execution time (in seconds) for sync process. Soft exec time only generates a warning. Hard exec time will generate a warning and stop sync process.
@@ -101,7 +105,7 @@ CONFLICT_BACKUP_MULTIPLE=no
 ## Osync will clean backup files after a given number of days. Setting this to 0 will disable cleaning and keep backups forever. Warning: This can be very space consuming.
 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
+CONFLICT_PREVALANCE=initiator
 
 ## 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
@@ -114,7 +118,7 @@ SOFT_DELETE_DAYS=30
 RESUME_SYNC=yes
 ## 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 careful with this option if you have multiple masters.
+## When a pidlock exists on slave replica that does not correspond to the initiator's sync-id, force pidlock removal. Be careful with this option if you have multiple initiators.
 FORCE_STRANGER_LOCK_RESUME=no
 
 ## Keep partial uploads that can be resumed on next run, experimental feature