update man page (after conflict)
Merge branch 'master' of github.com:rear/rear

Conflicts:
	doc/rear.8