document --force (closes #711057)
Merge branch 'master' of ssh://git.debian.org/git/collab-maint/dputng