diff --git a/ChangeLog b/ChangeLog index 6868ceabd..31d6958af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ChangeLog ========== +version 0.42.0 (released 2009-02-10) + * Small fix in the userguide. + version 0.42.0 rc3 (released 2009-01-23) libcsync: * Added checks for unix extensions. diff --git a/doc/userguide/csync.html b/doc/userguide/csync.html index cf77c95a0..529b77fd4 100644 --- a/doc/userguide/csync.html +++ b/doc/userguide/csync.html @@ -484,8 +484,8 @@ information.
The goal is to detect conflicting updates (files which have been modified) and propagate non-conflicting updates to each replica. If there are no conflicts left, we are done, and the replicas are identical. To resolve or handle -conflicts there are several algorithms available. They are discussed later in -this documents.