Update man page and changelog to reflect --token-* changes

Also, tweak the man page syntax so it is more consistent with how other
options are documented.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>