Please include reference to the protocol modules' options and how to "pull the trigger" manually

My commit history shows a mess with branching, detached HEADs etc. but the result should be OK. Please pull.

This partly fixes: http://bugs.debian.org/682800