Merge "Fix and complete synopsis of commands in documentation"