From c4182431ac7d9d306fdd2267e082fa4cec6fec2c Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm This
@@ -65,21 +65,6 @@ distinguished: This
-results into the following categories: left
- only right
- only left
- newer right
- newer equal conflict
- (same date, different size)Comparison
Settings
-
+
I.
Compare by "File time and size"
-
II.
@@ -110,17 +95,6 @@ modification time is not taken into account at all.
As a -result the files are separated into the following categories:
-left - only
-right - only
-equal
-different - content
-
Note
Under Windows the symbolic link options apply to all symbolic links, - "volume mount points" and "NTFS junction + "volume mount points" and "NTFS junction points".
Copying symbolic links requires
diff --git a/BUILD/Help/html/Daylight Saving Time.html b/BUILD/Help/html/Daylight Saving Time.html
index d088d807..31c5f8e2 100644
--- a/BUILD/Help/html/Daylight Saving Time.html
+++ b/BUILD/Help/html/Daylight Saving Time.html
@@ -3,9 +3,9 @@
Single
- file C:\Source\file.txt: Single
folder C:\Source\subfolder: Multiple
- entries separated by semicolon:
Exclude:
+ file C:\Source\file.txt:
Exclude:
\file.txt
Exclude:
@@ -64,7 +64,7 @@ Exclude items for mirror-sync from
in their path:
Exclude:
*temp*
Exclude:
+ entries separated by semicolon:
Exclude:
*.tmp;
*.doc; *.bak
diff --git a/BUILD/Help/html/External Applications.html b/BUILD/Help/html/External Applications.html
index f9d939dc..bdf08cb5 100644
--- a/BUILD/Help/html/External Applications.html
+++ b/BUILD/Help/html/External Applications.html
@@ -3,9 +3,9 @@
By -default FreeFileSync opens the operating system's standard file -browser on each mouse double-click by invoking "explorer +default FreeFileSync opens the operating system's file browser on +each mouse double-click by invoking "explorer /select, "%item_path%"" on Windows and "xdg-open "%item_folder%"" on Linux.
However -you are free to integrate other external applications into -FreeFileSync: navigate to "Menu --> Advanced -> Global settings: External Applications" -and add or replace a command string. The first entry is executed when -double-clicking a row on main grid while all other entries are only -available via right-click context menu. The following internal macros -may be used:
+you may integrate other external applications into FreeFileSync: +navigate to "Menu -> +Advanced -> Global settings: External Applications" +and add or replace a command. The first entry is executed when +double-clicking a row or pressing ENTER on main grid while all other +entries can only be accessed via the context menu shown after a +right-click. The following internal macros are available:
%item_path% -
full file or folder
name
%item_folder% - folder
- part only
%item2_path% - Other
- side's counterpart to %item_path%
%item2_folder% -
- Other side's counterpart to
- %item_folder%
%item2_path% -
+ Counterpart of %item_path% on the
+ opposite grid
%item2_folder% - Counterpart
+ of %item_folder% on the opposite grid
diff --git a/BUILD/Help/html/RealtimeSync.html b/BUILD/Help/html/RealtimeSync.html
index f7740c09..b8a94c62 100644
--- a/BUILD/Help/html/RealtimeSync.html
+++ b/BUILD/Help/html/RealtimeSync.html
@@ -71,7 +71,7 @@ to begin monitoring.
Using
RealtimeSync is not restricted to starting FreeFileSync. It can
diff --git a/BUILD/Help/html/Run as Service.html b/BUILD/Help/html/Run as Service.html
index f6329a33..ae8f57c3 100644
--- a/BUILD/Help/html/Run as Service.html
+++ b/BUILD/Help/html/Run as Service.html
@@ -3,9 +3,9 @@
"C:\Program Files\FreeFileSync\RealtimeSync.exe" "C:\some - folder\SyncJob.ffs_batch"
+ folder\SyncJob.ffs_real"
RealtimeSync should be monitoring while Windows is online irrespective of @@ -63,7 +63,7 @@ file>
a Batch Job for an example how to add a new task. Then change the user to run the task to "SYSTEM" - a special user account always running in the background. - +
Enter
"Run:" as: <FreeFileSync
installation directory>\FreeFileSync.exe <job
- name>.ffs_batch
Ubuntu Linux Gnome-schedule:
diff --git a/BUILD/Help/img/ScheduleBatch.gif b/BUILD/Help/img/ScheduleBatch.gif deleted file mode 100644 index 20d27d6d..00000000 Binary files a/BUILD/Help/img/ScheduleBatch.gif and /dev/null differ diff --git a/BUILD/Help/img/ScheduleBatch.png b/BUILD/Help/img/ScheduleBatch.png new file mode 100644 index 00000000..c991d1fd Binary files /dev/null and b/BUILD/Help/img/ScheduleBatch.png differ diff --git a/BUILD/Help/img/create_shortcut.png b/BUILD/Help/img/create_shortcut.png index fba73ec1..2c42f3a1 100644 Binary files a/BUILD/Help/img/create_shortcut.png and b/BUILD/Help/img/create_shortcut.png differ diff --git a/BUILD/Help/img/schedule_realtimesync.png b/BUILD/Help/img/schedule_realtimesync.png index 285804b4..ac1e2a80 100644 Binary files a/BUILD/Help/img/schedule_realtimesync.png and b/BUILD/Help/img/schedule_realtimesync.png differ diff --git a/BUILD/Help/img/shortcut_properties.png b/BUILD/Help/img/shortcut_properties.png index c801f6d3..1e06b617 100644 Binary files a/BUILD/Help/img/shortcut_properties.png and b/BUILD/Help/img/shortcut_properties.png differ diff --git a/BUILD/Help/img/win7scheduler.png b/BUILD/Help/img/win7scheduler.png index 08314d16..93f1e020 100644 Binary files a/BUILD/Help/img/win7scheduler.png and b/BUILD/Help/img/win7scheduler.png differ -- cgit