consistent use of -r and notes about it
improve password and token examples [ci skip]