fix documentation
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpctl.8