# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266803322 0
# Node ID 749dbdbd4a0025ab09568dc59c0ef6cd3f7b760c
# Parent  78af99ce9c0798bb03ee924fae5a17cf9982668d# Parent  c2dde8bda3fe1db1f043b574fdf06a9d6d3a78cf
Merge with 0.7

diff -r 78af99ce9c07 -r 749dbdbd4a00 prosodyctl
--- a/prosodyctl	Mon Feb 22 01:06:46 2010 +0000
+++ b/prosodyctl	Mon Feb 22 01:48:42 2010 +0000
@@ -435,7 +435,7 @@
 
 function commands.restart(arg)
 	if arg[1] == "--help" then
-		show_usage([[stop]], [[Stop and start a running Prosody server]]);
+		show_usage([[restart]], [[Restart a running Prosody server]]);
 		return 1;
 	end
 	
@@ -504,6 +504,10 @@
 	};
 
 function commands.addplugin(arg)
+	if not arg[1] or arg[1] == "--help" then
+		show_usage("addplugin URL", "Download and install a plugin from a URL");
+		return 1;
+	end
 	local url = arg[1];
 	if url:match("^http://") then
 		local http = require "socket.http";
@@ -575,8 +579,8 @@
 	print("");
 	print("Where COMMAND may be one of:\n");
 
-	local hidden_commands = require "util.set".new{ "register", "unregister" };
-	local commands_order = { "adduser", "passwd", "deluser" };
+	local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
+	local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
 
 	local done = {};