Merge pull request #820 from FranciscoBorges/master

Add a link to the section about masked-passwords
Output options in sorted order.