Merge branch 'processone:master' into master

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 2eeb97b99..0174cd7ff 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -119,12 +119,12 @@ get_commands_spec() ->
 			desc = "Restart ejabberd gracefully",
 			module = init, function = restart,
 			args = [], result = {res, rescode}},
-     #ejabberd_commands{name = reopen_log, tags = [logs, server],
+     #ejabberd_commands{name = reopen_log, tags = [logs],
 			desc = "Reopen the log files",
 			policy = admin,
 			module = ?MODULE, function = reopen_log,
 			args = [], result = {res, rescode}},
-     #ejabberd_commands{name = rotate_log, tags = [logs, server],
+     #ejabberd_commands{name = rotate_log, tags = [logs],
 			desc = "Rotate the log files",
 			module = ?MODULE, function = rotate_log,
 			args = [], result = {res, rescode}},
@@ -139,14 +139,14 @@ get_commands_spec() ->
 			args_example = [60, <<"Server will stop now.">>],
 			args = [{delay, integer}, {announcement, string}],
 			result = {res, rescode}},
-     #ejabberd_commands{name = get_loglevel, tags = [logs, server],
+     #ejabberd_commands{name = get_loglevel, tags = [logs],
 			desc = "Get the current loglevel",
 			module = ejabberd_logger, function = get,
 			result_desc = "Tuple with the log level number, its keyword and description",
 			result_example = warning,
 			args = [],
                         result = {levelatom, atom}},
-     #ejabberd_commands{name = set_loglevel, tags = [logs, server],
+     #ejabberd_commands{name = set_loglevel, tags = [logs],
 			desc = "Set the loglevel",
 			module = ?MODULE, function = set_loglevel,
 			args_desc = ["Desired logging level: none | emergency | alert | critical "
@@ -200,7 +200,7 @@ get_commands_spec() ->
 			result_example = [<<"example.com">>, <<"anon.example.com">>],
 			args = [],
 			result = {vhosts, {list, {vhost, string}}}},
-     #ejabberd_commands{name = reload_config, tags = [server, config],
+     #ejabberd_commands{name = reload_config, tags = [config],
 			desc = "Reload config file in memory",
 			module = ?MODULE, function = reload_config,
 			args = [],
@@ -254,21 +254,21 @@ get_commands_spec() ->
 			module = ejabberd_piefxis, function = import_file,
 			args_desc = ["Full path to the PIEFXIS file"],
 			args_example = ["/var/lib/ejabberd/example.com.xml"],
-			args = [{file, string}], result = {res, rescode}},
+			args = [{file, binary}], result = {res, rescode}},
      #ejabberd_commands{name = export_piefxis, tags = [mnesia],
 			desc = "Export data of all users in the server to PIEFXIS files (XEP-0227)",
 			module = ejabberd_piefxis, function = export_server,
 			args_desc = ["Full path to a directory"],
 			args_example = ["/var/lib/ejabberd/"],
-			args = [{dir, string}], result = {res, rescode}},
+			args = [{dir, binary}], result = {res, rescode}},
      #ejabberd_commands{name = export_piefxis_host, tags = [mnesia],
 			desc = "Export data of users in a host to PIEFXIS files (XEP-0227)",
 			module = ejabberd_piefxis, function = export_host,
 			args_desc = ["Full path to a directory", "Vhost to export"],
 			args_example = ["/var/lib/ejabberd/", "example.com"],
-			args = [{dir, string}, {host, string}], result = {res, rescode}},
+			args = [{dir, binary}, {host, binary}], result = {res, rescode}},
 
-     #ejabberd_commands{name = delete_mnesia, tags = [mnesia, sql],
+     #ejabberd_commands{name = delete_mnesia, tags = [mnesia],
                         desc = "Delete elements in Mnesia database for a given vhost",
                         module = ejd2sql, function = delete,
 			args_desc = ["Vhost which content will be deleted in Mnesia database"],
@@ -326,7 +326,7 @@ get_commands_spec() ->
 			args_example = ["example.com", "/var/lib/ejabberd/example.com.sql"],
 			args = [{host, string}, {file, string}],
 			result = {res, rescode}},
-     #ejabberd_commands{name = set_master, tags = [mnesia],
+     #ejabberd_commands{name = set_master, tags = [cluster],
 			desc = "Set master node of the clustered Mnesia tables",
 			longdesc = "If you provide as nodename \"self\", this "
 			"node will be set as its own master.",