Merge branch 'master' into fix_to_no_password_in_config

* master:
  Update README.md

commands/prepare.go

@@ -59,9 +59,10 @@ func (*PrepareCmd) Synopsis() string {
 func (*PrepareCmd) Usage() string {
 	return `prepare:
 	prepare
-			[-config=/path/to/config.toml] [-debug]
+			[-config=/path/to/config.toml]
 			[-ask-sudo-password]
 			[-ask-key-password]
+			[-debug]
 
 `
 }
@@ -78,7 +79,7 @@ func (p *PrepareCmd) SetFlags(f *flag.FlagSet) {
 		&p.askKeyPassword,
 		"ask-key-password",
 		false,
-		"Ask ssh privatekey password of target servers before scanning",
+		"Ask ssh privatekey password before scanning",
 	)
 
 	f.BoolVar(

commands/scan.go

@@ -116,6 +116,13 @@ func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
 	f.BoolVar(&p.reportSlack, "report-slack", false, "Slack report")
 	f.BoolVar(&p.reportMail, "report-mail", false, "Email report")
 
+	f.BoolVar(
+		&p.askKeyPassword,
+		"ask-key-password",
+		false,
+		"Ask ssh privatekey password before scanning",
+	)
+
 	f.BoolVar(
 		&p.askSudoPassword,
 		"ask-sudo-password",
@@ -123,13 +130,6 @@ func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
 		"Ask sudo password of target servers before scanning",
 	)
 
-	f.BoolVar(
-		&p.askKeyPassword,
-		"ask-key-password",
-		false,
-		"Ask ssh privatekey password of target servers before scanning",
-	)
-
 	f.BoolVar(
 		&p.useYumPluginSecurity,
 		"use-yum-plugin-security",