Merge branch 'refs/heads/t/max-errors'

The topic branch was cooking for about a week, and it was tested with
no problems on several multi-terabyte file systems.

	* Rework restart logic, introduce --max-errors.
	* Fix typo in help text of --daemon.

diff --cc NEWS
index db77b4591b3775b458bb8b86a0a882cae5b4d432,db77b4591b3775b458bb8b86a0a882cae5b4d432..444c12eef89103900bf3aaa14fcb6bfe747d4d86
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,8 -2,8 +2,13 @@@
  0.1.6 (to be announced)
  -----------------------
  
--- New option --min-complete
--- New home page URL, email address
++ - New option --min-complete to specify the minimal number of snapshots
++   to keep.
++
++ - Improved handling of rsync errors. The new --max-rsync-errors option
++ tells dss to terminate after the given number of rsync failures.
++
++ - New home page URL, email address
  
  ------------------
  0.1.5 (2014-01-14)

diff --cc dss.c
Simple merge