Merge branch 'master' into debian

Conflicts:
	examples/example.ldap

1 files changed, 20 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index ef8592e..9867b54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+backupninja (0.9.8-1) UNRELEASED
+
+	* duplicity 0.6.01 and later defaults to using an archive (cache)
+	  directory, which was previously opt-in. Starting with backupninja
+	  0.9.8, the backupninja duplicity handler puts this cache into
+	  /var/cache/backupninja/duplicity unless specified by the user with
+	  the "options" setting the *.dup job.
+	  When backups have been performed with backupninja older than 0.9.8 in
+	  conjunction with duplicity 0.6.01 or later, e.g. when using Sid or
+	  Squeeze at certain times of the Squeeze release cycle, cache files
+	  were probably saved into /root/.cache/duplicity; one may want to
+	  delete these files, or rather save bandwidth and just move the cache
+	  directory to the new location:
+
+	             mkdir -p /var/cache/backupninja
+	             mv /root/.cache/duplicity /var/cache/backupninja/
+
+	  It is probably desirable to exclude this cache directory from
+	  duplicity backup sets to avoid some kind of reentrant backup problem.
+
 backupninja (0.9.7-1) UNRELEASED
 
 	* mysql: output filenames to support shell meta-characters in