Diff

prosodyctl @ 4541:05f5ec99da77

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000
parent 4476:53ce21286b8c
child 4487:5f466a50e78b
line wrap: on
line diff
--- a/prosodyctl	Sat Dec 10 17:21:19 2011 +0000
+++ b/prosodyctl	Sun Jan 22 22:55:49 2012 +0000
@@ -540,7 +540,7 @@
 
 function commands.reload(arg)
 	if arg[1] == "--help" then
-		show_usage([[reload]], [[Reload prosody configuration file]]);
+		show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
 		return 1;
 	end