diff --git a/ejabberd.doap b/ejabberd.doap index da8678d5e..9644af2cc 100644 --- a/ejabberd.doap +++ b/ejabberd.doap @@ -759,7 +759,7 @@ 0.3.0 - 24.xx + 24.06 mod_mam diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index eb33d2e0f..37d5e622f 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -251,7 +251,7 @@ get_commands_spec() -> #ejabberd_commands{name = join_cluster, tags = [cluster], desc = "Join our local node into the cluster handled by Node", - note = "improved in 24.xx", + note = "improved in 24.06", module = ?MODULE, function = join_cluster, args_desc = ["Nodename of the node to join"], args_example = [<<"ejabberd1@machine7">>], @@ -259,7 +259,7 @@ get_commands_spec() -> result = {res, restuple}}, #ejabberd_commands{name = join_cluster_here, tags = [cluster], desc = "Join a remote Node here, into our cluster", - note = "added in 24.xx", + note = "added in 24.06", module = ?MODULE, function = join_cluster_here, args_desc = ["Nodename of the node to join here"], args_example = [<<"ejabberd1@machine7">>], @@ -286,7 +286,7 @@ get_commands_spec() -> result = {nodes, {list, {node, atom}}}}, #ejabberd_commands{name = list_cluster_detailed, tags = [cluster], desc = "List nodes (both running and known) and some stats", - note = "added in 24.xx", + note = "added in 24.06", module = ?MODULE, function = list_cluster_detailed, args = [], result_example = [{'ejabberd@localhost', "true", @@ -427,7 +427,7 @@ get_commands_spec() -> result = {res, rescode}}, #ejabberd_commands{name = get_master, tags = [cluster], desc = "Get master node of the clustered Mnesia tables", - note = "added in 24.xx", + note = "added in 24.06", longdesc = "If there is no master, returns `none`.", module = ?MODULE, function = get_master, result = {nodename, atom}}, diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl index bd80461c0..061b1dccb 100644 --- a/src/ejabberd_options_doc.erl +++ b/src/ejabberd_options_doc.erl @@ -923,9 +923,11 @@ doc() -> [binary:part(ejabberd_config:version(), {0,5})]}}}, {update_sql_schema, #{value => "true | false", - note => "added in 23.10", + note => "updated in 24.06", desc => ?T("Allow ejabberd to update SQL schema. " + "This option was added in ejabberd 23.10, " + "and enabled by default since 24.06. " "The default value is 'true'.")}}, {oauth_access, #{value => ?T("AccessName"), @@ -1379,7 +1381,7 @@ doc() -> "or 'ram' if the latter is not set.")}}, {sql_server, #{value => "Host | IP Address | ODBC Connection String | Unix Socket Path", - note => "improved in 24.xx", + note => "improved in 24.06", desc => ?T("The hostname or IP address of the SQL server. For _`sql_type`_ " "'mssql' or 'odbc' this can also be an ODBC connection string. " diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 93973dba1..91fcc5896 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -1054,7 +1054,7 @@ get_commands_spec() -> desc = "Disconnect user's active sessions", module = ?MODULE, function = kick_user_restuple, version = 2, - note = "modified in 24.xx", + note = "modified in 24.06", args = [{user, binary}, {host, binary}], args_desc = ["User name", "Server name"], args_example = [<<"user1">>, <<"example.com">>], diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 1bfbeb4d1..7a592462c 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -279,7 +279,7 @@ get_commands_spec() -> "and `_unban_account`_ API.", module = ?MODULE, function = ban_account_v2, version = 2, - note = "improved in 24.xx", + note = "improved in 24.06", args = [{user, binary}, {host, binary}, {reason, binary}], args_example = [<<"attacker">>, <<"myserver.com">>, <<"Spaming other users">>], args_desc = ["User name to ban", "Server name", @@ -291,7 +291,7 @@ get_commands_spec() -> longdesc = "Check _`ban_account`_ API.", module = ?MODULE, function = get_ban_details, version = 2, - note = "added in 24.xx", + note = "added in 24.06", args = [{user, binary}, {host, binary}], args_example = [<<"attacker">>, <<"myserver.com">>], args_desc = ["User name to unban", "Server name"], @@ -309,7 +309,7 @@ get_commands_spec() -> longdesc = "Check _`ban_account`_ API.", module = ?MODULE, function = unban_account, version = 2, - note = "added in 24.xx", + note = "added in 24.06", args = [{user, binary}, {host, binary}], args_example = [<<"gooduser">>, <<"myserver.com">>], args_desc = ["User name to unban", "Server name"], @@ -692,7 +692,7 @@ get_commands_spec() -> ]}}}}}, #ejabberd_commands{name = get_roster_count, tags = [roster], desc = "Get number of contacts in a local user roster", - note = "added in 24.xx", + note = "added in 24.06", policy = user, module = ?MODULE, function = get_roster_count, args = [], @@ -810,7 +810,7 @@ get_commands_spec() -> #ejabberd_commands{name = srg_add, tags = [shared_roster_group], desc = "Add/Create a Shared Roster Group (without details)", module = ?MODULE, function = srg_add, - note = "added in 24.xx", + note = "added in 24.06", args = [{group, binary}, {host, binary}], args_example = [<<"group3">>, <<"myserver.com">>], args_desc = ["Group identifier", "Group server name"], @@ -843,7 +843,7 @@ get_commands_spec() -> #ejabberd_commands{name = srg_set_info, tags = [shared_roster_group], desc = "Set info of a Shared Roster Group", module = ?MODULE, function = srg_set_info, - note = "added in 24.xx", + note = "added in 24.06", args = [{group, binary}, {host, binary}, {key, binary}, {value, binary}], args_example = [<<"group3">>, <<"myserver.com">>, <<"label">>, <<"Family">>], args_desc = ["Group identifier", "Group server name", @@ -854,7 +854,7 @@ get_commands_spec() -> #ejabberd_commands{name = srg_get_displayed, tags = [shared_roster_group], desc = "Get displayed groups of a Shared Roster Group", module = ?MODULE, function = srg_get_displayed, - note = "added in 24.xx", + note = "added in 24.06", args = [{group, binary}, {host, binary}], args_example = [<<"group3">>, <<"myserver.com">>], args_desc = ["Group identifier", "Group server name"], @@ -864,7 +864,7 @@ get_commands_spec() -> #ejabberd_commands{name = srg_add_displayed, tags = [shared_roster_group], desc = "Add a group to displayed_groups of a Shared Roster Group", module = ?MODULE, function = srg_add_displayed, - note = "added in 24.xx", + note = "added in 24.06", args = [{group, binary}, {host, binary}, {add, binary}], args_example = [<<"group3">>, <<"myserver.com">>, <<"group1">>], @@ -874,7 +874,7 @@ get_commands_spec() -> #ejabberd_commands{name = srg_del_displayed, tags = [shared_roster_group], desc = "Delete a group from displayed_groups of a Shared Roster Group", module = ?MODULE, function = srg_del_displayed, - note = "added in 24.xx", + note = "added in 24.06", args = [{group, binary}, {host, binary}, {del, binary}], args_example = [<<"group3">>, <<"myserver.com">>, <<"group1">>], diff --git a/src/mod_mam.erl b/src/mod_mam.erl index 57a6d94c9..77baecac3 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -28,7 +28,7 @@ -protocol({xep, 313, '0.6.1', '15.06', "", ""}). -protocol({xep, 334, '0.2'}). -protocol({xep, 359, '0.5.0'}). --protocol({xep, 425, '0.3.0', '24.xx', "", ""}). +-protocol({xep, 425, '0.3.0', '24.06', "", ""}). -protocol({xep, 441, '0.2.0'}). -behaviour(gen_mod). diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index b9e840022..be397fbd8 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -247,7 +247,7 @@ get_commands_spec() -> longdesc = "The MUC service argument can be `global` to get all hosts.", module = ?MODULE, function = rooms_empty_destroy_restuple, version = 2, - note = "modified in 24.xx", + note = "modified in 24.06", args_desc = ["MUC service, or `global` for all"], args_example = ["conference.example.com"], result_desc = "List of empty rooms that have been destroyed",