Help prototype update

Produce a sensible error if neither -func nor -dev is specified.
Merge branch 'master' into KDP