Diff

prosodyctl @ 6368:bd0c8b361589

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 28 Aug 2014 12:05:18 +0100
parent 6367:769a3577dd85
child 6405:61801dacc90b
line wrap: on
line diff
--- a/prosodyctl	Wed Aug 13 19:22:08 2014 +0200
+++ b/prosodyctl	Thu Aug 28 12:05:18 2014 +0100
@@ -220,6 +220,7 @@
 		["no-such-host"] = "The given hostname does not exist in the config";
 		["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?";
 		["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help";
+		["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see http://prosody.im/doc/prosodyctl#pidfile for help";
 		["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info";
 		["no-such-method"] = "This module has no commands";
 		["not-running"] = "Prosody is not running";