# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1693386552 -7200
# Node ID 53708752cc5d4ef99160d84c1ea1cfff14401760
# Parent  df96af19822290cd2631e27801376248d5a45718# Parent  a2ba3f06dcf44b713b65355351653826cccea59c
Merge 0.12->trunk

diff -r df96af198222 -r 53708752cc5d util/prosodyctl/check.lua
--- a/util/prosodyctl/check.lua	Sat Aug 26 15:10:58 2023 +0200
+++ b/util/prosodyctl/check.lua	Wed Aug 30 11:09:12 2023 +0200
@@ -369,7 +369,7 @@
 		local deprecated_replacements = {
 			anonymous_login = instead_use("option", "authentication", "anonymous");
 			daemonize = "instead, use the --daemonize/-D or --foreground/-F command line flags";
-			disallow_s2s = instead_use("module", "s2s");
+			disallow_s2s = instead_use("module", "s2s", "modules_disabled");
 			no_daemonize = "instead, use the --daemonize/-D or --foreground/-F command line flags";
 			require_encryption = "instead, use 'c2s_require_encryption' and 's2s_require_encryption'";
 			vcard_compatibility = instead_use("community", "mod_compat_vcard");