summaryrefslogtreecommitdiff
path: root/BUILD/Help
diff options
context:
space:
mode:
Diffstat (limited to 'BUILD/Help')
-rw-r--r--BUILD/Help/FreeFileSync.hhp2
-rw-r--r--BUILD/Help/Table of Contents.hhc10
-rw-r--r--BUILD/Help/html/Unbenannt 1.odfbin4975 -> 0 bytes
-rw-r--r--BUILD/Help/html/advanced/BackupStrategy.html (renamed from BUILD/Help/html/advanced/TimeStamped.html)51
-rw-r--r--BUILD/Help/html/advanced/CompareFileSize.html23
-rw-r--r--BUILD/Help/html/advanced/DaylightSavingTime.html71
-rw-r--r--BUILD/Help/html/advanced/EnvironmentVariables.html11
-rw-r--r--BUILD/Help/html/advanced/ExternalApp.html9
-rw-r--r--BUILD/Help/html/advanced/Ftp.html48
-rw-r--r--BUILD/Help/html/advanced/RealtimeSync.html13
-rw-r--r--BUILD/Help/html/advanced/RunAsService.html9
-rw-r--r--BUILD/Help/html/advanced/SendMail.html15
-rw-r--r--BUILD/Help/html/advanced/ShadowCopy.html14
-rw-r--r--BUILD/Help/html/advanced/SymbolicLinks.html6
14 files changed, 165 insertions, 117 deletions
diff --git a/BUILD/Help/FreeFileSync.hhp b/BUILD/Help/FreeFileSync.hhp
index 02e45e53..a20a4acd 100644
--- a/BUILD/Help/FreeFileSync.hhp
+++ b/BUILD/Help/FreeFileSync.hhp
@@ -20,7 +20,7 @@ html\advanced\Ftp.html
html\advanced\ScheduleBatch.html
html\advanced\SendMail.html
html\advanced\SymbolicLinks.html
-html\advanced\TimeStamped.html
+html\advanced\BackupStrategy.html
html\advanced\VariableDrive.html
html\Overview.html
html\advanced\DaylightSavingTime.html
diff --git a/BUILD/Help/Table of Contents.hhc b/BUILD/Help/Table of Contents.hhc
index 35ad8d46..1c23acff 100644
--- a/BUILD/Help/Table of Contents.hhc
+++ b/BUILD/Help/Table of Contents.hhc
@@ -29,11 +29,15 @@
</OBJECT>
<UL>
<LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="Backup Strategies">
+ <param name="Local" value="html\advanced\BackupStrategy.html">
+ </OBJECT>
+ <LI> <OBJECT type="text/sitemap">
<param name="Name" value="Batch Scripting">
<param name="Local" value="html\advanced\Batch Scripting.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Compare by filesize">
+ <param name="Name" value="Compare by file size">
<param name="Local" value="html\advanced\CompareFileSize.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
@@ -81,10 +85,6 @@
<param name="Local" value="html\advanced\Ftp.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
- <param name="Name" value="Time-stamped directories">
- <param name="Local" value="html\advanced\TimeStamped.html">
- </OBJECT>
- <LI> <OBJECT type="text/sitemap">
<param name="Name" value="Variable drive letters">
<param name="Local" value="html\advanced\VariableDrive.html">
</OBJECT>
diff --git a/BUILD/Help/html/Unbenannt 1.odf b/BUILD/Help/html/Unbenannt 1.odf
deleted file mode 100644
index e51231f5..00000000
--- a/BUILD/Help/html/Unbenannt 1.odf
+++ /dev/null
Binary files differ
diff --git a/BUILD/Help/html/advanced/TimeStamped.html b/BUILD/Help/html/advanced/BackupStrategy.html
index 392efea2..c3274e2a 100644
--- a/BUILD/Help/html/advanced/TimeStamped.html
+++ b/BUILD/Help/html/advanced/BackupStrategy.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100713;20300500">
+ <META NAME="CHANGED" CONTENT="20100902;19191700">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -22,22 +22,36 @@
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Create regular
-backups with time-stamped directory names</FONT></H3>
+<BODY LANG="en-US" DIR="LTR">
+<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Backup strategies</FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">You can
-use special macros within directory names that are expanded during
-synchronization.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>1.
+Full backup with versioning of old files</B></FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
+synchronization settings select and specify a &quot;User-defined
+directory&quot; for deletion handling. FreeFileSync will place files
+that have been deleted or overwritten with newer versions into
+corresponding time-stamped sub directories. This provides a
+space-optimized way to retain all older versions of files while the
+most recent ones are available in main source and target directories.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>2.
+Full backup to different target directories</B></FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">All
+directory input fields may contain environment variables and special
+macros that are expanded during synchronization. This allows for
+complete backups into different target directories.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Let's
-assume you have a directory &quot;<FONT FACE="Courier New, monospace">C:\Source</FONT>&quot;
-which you want to backup each day into a time-stamped target
-directory like &quot;<FONT FACE="Courier New, monospace">C:\Target_2009-10-08</FONT>&quot;.
-All that needs to be done is setting up base directories like these:</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">A
+directory &quot;C:\Source&quot; requires a daily backup into a
+time-stamped target directory like &quot;C:\Target_2009-10-08&quot;.
+Base directories are set up accordingly:</FONT></P>
<UL>
<P><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
<UL>
@@ -58,16 +72,17 @@ errors</I>&quot; to avoid the warning that target directory is not
(yet) existing.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Overview:</B></FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Macro
+overview:</B></FONT></P>
<UL>
<P><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
<UL>
<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">%time%&nbsp;&nbsp;-
- </FONT>current time, format [hhmmss], e.g. &quot;<FONT FACE="Courier New, monospace">201340</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%date%&nbsp;&nbsp;-
- </FONT>current date, e.g. &quot;<FONT FACE="Courier New, monospace">2010-07-13</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%week%&nbsp;&nbsp;-
- </FONT>calendar week, e.g. &quot;<FONT FACE="Courier New, monospace">28</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%month%&nbsp;-
- </FONT>current month, e.g. &quot;<FONT FACE="Courier New, monospace">July</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%year%&nbsp;&nbsp;-
- </FONT>current year, e.g. &quot;<FONT FACE="Courier New, monospace">2010</FONT>&quot;</FONT></P>
+ </FONT>current time, format [hhmmss], e. g. &quot;<FONT FACE="Courier New, monospace">201340</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%date%&nbsp;&nbsp;-
+ </FONT>current date, e. g. &quot;<FONT FACE="Courier New, monospace">2010-07-13</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%week%&nbsp;&nbsp;-
+ </FONT>calendar week, e. g. &quot;<FONT FACE="Courier New, monospace">28</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%month%&nbsp;-
+ </FONT>current month, e. g. &quot;<FONT FACE="Courier New, monospace">July</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%year%&nbsp;&nbsp;-
+ </FONT>current year, e. g. &quot;<FONT FACE="Courier New, monospace">2010</FONT>&quot;</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT>
</P>
diff --git a/BUILD/Help/html/advanced/CompareFileSize.html b/BUILD/Help/html/advanced/CompareFileSize.html
index 54744b51..af184fd9 100644
--- a/BUILD/Help/html/advanced/CompareFileSize.html
+++ b/BUILD/Help/html/advanced/CompareFileSize.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20091209;21185800">
+ <META NAME="CHANGED" CONTENT="20100902;19144900">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,27 +17,30 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
-<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Compare by
-filesize</FONT></H3>
+<BODY LANG="en-US" DIR="LTR">
+<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Compare by file
+size</FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Sometimes
-you might want to compare both sides by filesize only, ignoring last
+you might want to compare both sides by file size only, ignoring last
modification timestamps.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Instructions:</B></FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open
-your *.ffs_gui configuration file and change the value of XML node
+file &quot;</FONT><FONT FACE="Courier New, monospace">GlobalSettings.xml</FONT><FONT FACE="Tahoma, sans-serif">&quot;
+located either in &quot;</FONT><FONT FACE="Courier New, monospace">%appdata%\FreeFileSync</FONT><FONT FACE="Tahoma, sans-serif">&quot;
+or the installation folder and change the value of XML node
</FONT><FONT FACE="Courier New, monospace">&lt;FileTimeTolerance&gt;</FONT>
<FONT FACE="Tahoma, sans-serif">to some sufficiently large number of
-seconds. Changed files will now be detected as a conflict (same date,
-different filesize) and the default synchronization direction for
-conflics can be used.</FONT></P>
+seconds, for example 2.000.000.000. Changed files will now be
+detected as a conflict (same date, different file size) and the
+default synchronization direction for conflicts can be used.</FONT></P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/advanced/DaylightSavingTime.html b/BUILD/Help/html/advanced/DaylightSavingTime.html
index 4fffe036..b29a612a 100644
--- a/BUILD/Help/html/advanced/DaylightSavingTime.html
+++ b/BUILD/Help/html/advanced/DaylightSavingTime.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091208;20054200">
- <META NAME="CHANGED" CONTENT="20091211;18381300">
+ <META NAME="CHANGED" CONTENT="20100902;19275000">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,53 +17,50 @@
H2 { margin-bottom: 0.21cm }
H2.western { font-family: "Arial", sans-serif; font-size: 14pt; font-style: italic }
H2.cjk { font-family: "MS Mincho"; font-size: 14pt; font-style: italic }
- H2.ctl { font-size: 14pt; font-style: italic }
+ H2.ctl { font-family: "Mangal"; font-size: 14pt; font-style: italic }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H2 CLASS="western" STYLE="font-style: normal"><FONT FACE="Tahoma, sans-serif">Daylight
-saving time</FONT></H2>
+saving time <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></H2>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">A
+common problem synchronization software has to deal with are +-1 hour
+file time shifts after a Daylight Saving Time (DST) switch has
+occurred. This can be observed for example when a FAT-formatted
+volume is compared against an NTFS volume as frequently happening
+with USB memory sticks. Files that previously appeared to be in sync
+are now shown with an one hour modification time offset, although
+they have not been modified by the user or by other means.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The
-Windows operating system exhibits quite a unique behavior when
-handling timestamps on NTFS file systems. This leads to a well-known
-issue that all file synchronization software has to handle:</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">During
-daylight saving time switching, (local) file times are shifted by one
-hour on NTFS file systems, while NO shift occurs on FAT/FAT32 drives
-(as used by most USB sticks)! Thus when synchronizing an NTFS against
-a FAT32 volume file times become asynchronous twice a year!</FONT></P>
+reason for this strange behavior lies in the way NTFS and FAT drives
+store file times: NTFS stores time in UTC format, while FAT uses
+local time.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">When
+times stored in these two different formats are compared, one format
+has to be converted into the other first. In both cases Windows uses
+the current DST status as well as current time zone information for
+its calculations. Consequently the result of this comparison is
+dependent from current system settings and in particular file times
+that used to be the same can show up as different after a DST switch.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For a
-comprehensive discussion about this issue refer
-to:<BR><A HREF="http://www.codeproject.com/KB/datetime/dstbugs.aspx">http://www.codeproject.com/KB/datetime/dstbugs.aspx</A></FONT></P>
+detailed discussion about this issue refer to:
+<A HREF="http://www.codeproject.com/KB/datetime/dstbugs.aspx">http://www.codeproject.com/KB/datetime/dstbugs.aspx</A></FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Solution:</B></FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
-order to avoid re-copying files that have a modification time
-difference of +-1h FreeFileSync offers a global option: <I>Menu -&gt;
-Advanced -&gt; Global settings: Ignore 1-hour file time difference</I>.</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If
-&quot;<I>Ignore 1-hour file time difference</I>&quot; is checked, all
-files with a +-1h difference are treated as having the same time.
-This also handles different file time precisions (NTFS: 100ns,
-FAT/FAT32: 2 seconds) by allowing a 2 second tolerance .</FONT></P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Files
-that have a deviation of less than one hour are categorized as
-conflicts. The reasoning is that these files surely have been
-modified on at least one side since last synchronization. But during
-one of the two daylight saving time switches per year the older file
-is shown pretending a newer date which can lead to data loss (when
-using the rule to overwrite older with newer files).</FONT></P>
-<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
- <P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
- <FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>If synchronization
- takes place between NTFS &harr; NTFS or FAT32 &harr; FAT32 this
- checkbox provides no advantage and can be left unchecked.</FONT></P>
-</SPAN><BR CLEAR=LEFT><BR>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Luckily
+FreeFileSync users need not to worry about this issue. Each file on a
+FAT volume automatically gets additional meta data encoded in its
+creation date that enables a correct file time calculation. This not
+only solves all DST issues but also time shifts that occur due to
+travel between different time zones.</FONT></P>
+<P STYLE="margin-bottom: 0cm"><BR>
</P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/advanced/EnvironmentVariables.html b/BUILD/Help/html/advanced/EnvironmentVariables.html
index a85be8fd..26cffd7f 100644
--- a/BUILD/Help/html/advanced/EnvironmentVariables.html
+++ b/BUILD/Help/html/advanced/EnvironmentVariables.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100218;65300">
+ <META NAME="CHANGED" CONTENT="20100825;18572300">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,6 +17,7 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
@@ -29,9 +30,9 @@ Variables</FONT></H3>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">All
directory names may contain macros that are expanded during
synchronization. Begin and end of each macro is marked by a '%'
-character. Besides special macros handling time and date (see
-&quot;Time-stamped directories&quot;), the operating system's
-environment variables can also be used.</FONT></P>
+character. Besides special macros handling time and date (see &quot;Backup
+Strategies&quot;), the operating system's environment variables can
+also be used.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT></P>
<UL>
<P><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
diff --git a/BUILD/Help/html/advanced/ExternalApp.html b/BUILD/Help/html/advanced/ExternalApp.html
index 3994c96e..1c28932c 100644
--- a/BUILD/Help/html/advanced/ExternalApp.html
+++ b/BUILD/Help/html/advanced/ExternalApp.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20091212;16500300">
+ <META NAME="CHANGED" CONTENT="20100902;19180200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,18 +17,19 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Start an external
application via double-click</FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
opens the operating system's standard file browser per default on
-each double-click e.g. by invoking &quot;<FONT FACE="Courier New, monospace">explorer
+each double-click e. g. by invoking &quot;<FONT FACE="Courier New, monospace">explorer
/select, %name</FONT>&quot; on Windows.</FONT></P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If some
other application shall be started instead, just navigate to &quot;</FONT><FONT FACE="Tahoma, sans-serif"><I>Menu
diff --git a/BUILD/Help/html/advanced/Ftp.html b/BUILD/Help/html/advanced/Ftp.html
index b55301be..028ca05d 100644
--- a/BUILD/Help/html/advanced/Ftp.html
+++ b/BUILD/Help/html/advanced/Ftp.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20091209;21053000">
+ <META NAME="CHANGED" CONTENT="20100902;19174600">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,22 +17,25 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Synchronize with
-FTP</FONT></H3>
+FTP/WebDAV <SPAN STYLE="font-weight: normal">(Windows)</SPAN></FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">FreeFileSync
-does not support FTP directly. But the FTP functionality can be
-easily integrated by mapping the FTP webspace to a drive letter:</FONT></P>
+does not support accessing FTP volumes directly. But this
+functionality can be integrated by mapping the FTP web space to a
+drive letter:</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
-<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT><FONT FACE="Tahoma, sans-serif">
-Use the free utility NetDrive (<A HREF="http://www.netdrive.net/">http://www.netdrive.net</A>)</FONT></P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Example:</B></FONT>
+<FONT FACE="Tahoma, sans-serif">Use the free utility NetDrive
+(<A HREF="http://www.netdrive.net/">http://www.netdrive.net</A>)</FONT></P>
<UL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Add
a &quot;<I>New Site</I>&quot; and specify site name, site URL, drive
@@ -43,10 +46,37 @@ Use the free utility NetDrive (<A HREF="http://www.netdrive.net/">http://www.net
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
<FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>Most FTP drives set
- a file's timestamp to the current time when synchronizing ignoring
+ a file's time stamp to the current time when synchronizing ignoring
the source file's time and date. As a workaround you can do a
&quot;<I>compare by filesize</I>&quot;; see corresponding section.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Synchronize with
+SFTP <SPAN STYLE="font-weight: normal">(Linux)</SPAN></FONT></H3>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">An SFTP
+share can be easily mapped onto a local folder for use with
+FreeFileSync:</FONT></P>
+<UL>
+ <P><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+ <UL>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Install:</FONT><FONT FACE="Courier New, monospace"><BR>sudo
+ apt-get install sshfs</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Mount
+ SFTP share:</FONT><FONT FACE="Courier New, monospace"><BR>sshfs
+ ssh-account@ssh-server:[path] mountpoint</FONT></P>
+ <LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Unmount:</FONT><FONT FACE="Courier New, monospace"><BR>fusermount
+ -u mountpoint</FONT></P>
+ </UL>
+ </SPAN><BR CLEAR=LEFT>
+ </P>
+</UL>
+<P><BR><BR>
+</P>
</BODY>
</HTML> \ No newline at end of file
diff --git a/BUILD/Help/html/advanced/RealtimeSync.html b/BUILD/Help/html/advanced/RealtimeSync.html
index 5aabe112..692a1b36 100644
--- a/BUILD/Help/html/advanced/RealtimeSync.html
+++ b/BUILD/Help/html/advanced/RealtimeSync.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100428;21351600">
+ <META NAME="CHANGED" CONTENT="20100902;19164200">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,6 +17,7 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
@@ -30,8 +31,8 @@ primary function is to trigger synchronization immediately after
files in a source directory have changed. However its implementation
is much more flexible to cover an even broader range of use: A list
of directories provided by the user is monitored for changes.
-Whenever a file within these directories or subdirectories is
-modified OR the directory becomes available (e.g. insert of a
+Whenever a file within these directories or sub directories is
+modified OR the directory becomes available (e. g. insert of a
USB-stick), RealtimeSync responds by executing the user-specified
command line.</FONT></P>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -70,7 +71,7 @@ to begin monitoring.</FONT></P>
OR a FreeFileSync Batch file (<FONT FACE="Courier New, monospace">*.ffs_batch</FONT>)
as first command-line argument. Latter is implicitly converted to
a *.ffs_real file with default settings. This allows for
- integration with your operating system's autostart facility:</FONT></P>
+ integration with your operating system's auto start facility:</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT>
</P>
@@ -112,7 +113,7 @@ analog to the following:</FONT></P>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Whenever
directory &quot;</FONT><FONT FACE="Courier New, monospace">H:\Data</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-becomes available, the command-line executes and starts the batchjob
+becomes available, the command-line executes and starts the batch job
whose configuration is located on the stick. Furthermore it also
starts the batch job each time files are modified within &quot;</FONT><FONT FACE="Courier New, monospace">H:\Data</FONT><FONT FACE="Tahoma, sans-serif">&quot;.
</FONT>
diff --git a/BUILD/Help/html/advanced/RunAsService.html b/BUILD/Help/html/advanced/RunAsService.html
index 499d0d4d..07bbb56d 100644
--- a/BUILD/Help/html/advanced/RunAsService.html
+++ b/BUILD/Help/html/advanced/RunAsService.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100420;20042700">
+ <META NAME="CHANGED" CONTENT="20100902;19154500">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,6 +17,7 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
@@ -90,7 +91,7 @@ it!</FONT></P>
<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><BR>
</P>
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The new
-service can now be started via commandline or Windows Service
+service can now be started via command line or Windows Service
administration:</FONT></P>
<UL>
<P STYLE="margin-right: 0.98cm"><SPAN ID="Rahmen5" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
@@ -105,7 +106,7 @@ administration:</FONT></P>
<P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen7" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
<FONT FACE="Tahoma, sans-serif"><B>Note:</B><BR>By default the
- service is created with startup type &quot;automatic&quot; which
+ service is created with start-up type &quot;automatic&quot; which
runs it on Windows start. This behavior can be changed in Windows
Service administration.</FONT></P>
</SPAN><BR CLEAR=LEFT><BR>
diff --git a/BUILD/Help/html/advanced/SendMail.html b/BUILD/Help/html/advanced/SendMail.html
index d8fc7e9d..a3263f3c 100644
--- a/BUILD/Help/html/advanced/SendMail.html
+++ b/BUILD/Help/html/advanced/SendMail.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100228;21172600">
+ <META NAME="CHANGED" CONTENT="20100902;19140400">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,25 +17,24 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Synchronize in
Batch Mode and send error notification via email</FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
</P>
<OL>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
- a FreeFileSync batch file using &quot;<I>Si</I><I>lent mode</I>&quot;.</FONT></P>
- <P STYLE="margin-bottom: 0cm"></P>
+ a FreeFileSync batch file using &quot;<I>Silent mode</I>&quot;.</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Set
- error handling to &quot;<I>Exit instantly</I>&quot; or &quot;<I>Ig</I><I>nore
- errors</I>&quot; to avoid having a popup stop the program flow. In
- case errors occur FreeFileSync will exit with a returncode &lt; 0
+ error handling to &quot;<I>Exit instantly</I>&quot; or &quot;<I>Ignore
+ errors</I>&quot; to avoid having a pop-up stop the program flow. In
+ case errors occur FreeFileSync will exit with a return code &lt; 0
that can be checked via the ERRORLEVEL batch command.</FONT></P>
- <P STYLE="margin-bottom: 0cm"></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Create
a *.cmd or *.bat file to specify the location of FreeFileSync.exe
and pass the name of the FreeFileSync batch file as first argument;
diff --git a/BUILD/Help/html/advanced/ShadowCopy.html b/BUILD/Help/html/advanced/ShadowCopy.html
index d726ad76..98d50659 100644
--- a/BUILD/Help/html/advanced/ShadowCopy.html
+++ b/BUILD/Help/html/advanced/ShadowCopy.html
@@ -3,9 +3,9 @@
<HEAD>
<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
<TITLE></TITLE>
- <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.0 (Win32)">
+ <META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100413;18262600">
+ <META NAME="CHANGED" CONTENT="20100902;19132400">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -17,11 +17,12 @@
H3 { margin-bottom: 0.21cm }
H3.western { font-family: "Arial", sans-serif }
H3.cjk { font-family: "MS Mincho" }
+ H3.ctl { font-family: "Mangal" }
A:link { so-language: zxx }
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Volume Shadow
Copy Service <SPAN STYLE="font-weight: normal">(Windows only)</SPAN></FONT></H3>
<P STYLE="margin-bottom: 0cm"><BR>
@@ -38,12 +39,11 @@ Copy of the source drive. To enable this feature go to </FONT><FONT FACE="Tahoma
<LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">This
functionality is applied to locked files only. Regular files will
not use Volume Shadow Copy Service when being synchronized.</FONT></P>
- <P ALIGN=LEFT STYLE="margin-bottom: 0cm"></P>
</UL>
<UL>
- <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal">Creating
+ <LI><P ALIGN=LEFT STYLE="margin-bottom: 0cm; font-style: normal"><FONT FACE="Tahoma, sans-serif">Creating
Volume Snapshots using VSS requires the application to be started
- with Administrator rights.</SPAN></FONT></P>
+ with Administrator rights.</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT>
</P>
@@ -56,7 +56,7 @@ Copy of the source drive. To enable this feature go to </FONT><FONT FACE="Tahoma
<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">If you
experience problems using the Volume Shadow Copy Service a renewal of
registration might help. Create and execute a *.cmd batch file with
-the follow content or enter directly via commandline:</FONT></P>
+the follow content or enter directly via command line:</FONT></P>
<UL>
<P STYLE="margin-right: 0.98cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
diff --git a/BUILD/Help/html/advanced/SymbolicLinks.html b/BUILD/Help/html/advanced/SymbolicLinks.html
index 8117ab60..6efe1eb9 100644
--- a/BUILD/Help/html/advanced/SymbolicLinks.html
+++ b/BUILD/Help/html/advanced/SymbolicLinks.html
@@ -5,7 +5,7 @@
<TITLE></TITLE>
<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2 (Win32)">
<META NAME="CREATED" CONTENT="20091206;16574000">
- <META NAME="CHANGED" CONTENT="20100611;22010200">
+ <META NAME="CHANGED" CONTENT="20100902;19130700">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -22,7 +22,7 @@
-->
</STYLE>
</HEAD>
-<BODY LANG="de-DE" DIR="LTR">
+<BODY LANG="en-US" DIR="LTR">
<H3 CLASS="western"><FONT FACE="Tahoma, sans-serif">Symbolic link
handling <SPAN STYLE="font-weight: normal">(Windows since Vista and
Linux)</SPAN></FONT></H3>
@@ -39,7 +39,7 @@ Links (also called Symlinks or Soft Links):</FONT></P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">&quot;Direct&quot;
configures synchronization of the Symbolic Link object itself and
not its target. Symbolic Links will be visible on main grid as a
- separate entity with corresponding metadata. Links pointing to
+ separate entity with corresponding meta data. Links pointing to
directories are not traversed and the Link object is copied directly
during synchronization. <BR></FONT>&nbsp;</P>
<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">&quot;<I>Follow</I>&quot;
bgstack15