Diff

prosodyctl @ 8128:c14513401d65

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 25 Apr 2017 01:42:59 +0200
parent 8121:a33a87f13155
parent 8122:e56a90168890
child 8146:5c91fb62338e
line wrap: on
line diff
--- a/prosodyctl	Mon Apr 24 14:19:49 2017 +0200
+++ b/prosodyctl	Tue Apr 25 01:42:59 2017 +0200
@@ -936,7 +936,7 @@
 			return cert_commands[subcmd](arg);
 		end
 	end
-	show_usage("cert config|request|generate|key", "Helpers for generating X.509 certificates and keys.")
+	show_usage("cert config|request|generate|key|import", "Helpers for generating X.509 certificates and keys.")
 end
 
 function commands.check(arg)