# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1677101393 -3600
# Node ID 09b101a3b3e166d2c1c73590d55bb56540d636e0
# Parent  220d8d108f162770e8ff52baefd11dede1841027# Parent  4255db0f8e58d1edc282255fe970243c9a4a50f8
Merge 0.12->trunk

diff -r 220d8d108f16 -r 09b101a3b3e1 util/prosodyctl/check.lua
--- a/util/prosodyctl/check.lua	Tue Feb 21 13:30:32 2023 +0000
+++ b/util/prosodyctl/check.lua	Wed Feb 22 22:29:53 2023 +0100
@@ -341,8 +341,6 @@
 
 		local obsolete = set.new({ --> remove
 			"archive_cleanup_interval",
-			"cross_domain_bosh",
-			"cross_domain_websocket",
 			"dns_timeout",
 			"muc_log_cleanup_interval",
 			"s2s_dns_resolvers",
@@ -375,6 +373,8 @@
 			registration_whitelist = instead_use("option", "registration_allowlist");
 			registration_blacklist = instead_use("option", "registration_blocklist");
 			blacklist_on_registration_throttle_overload = instead_use("blocklist_on_registration_throttle_overload");
+			cross_domain_bosh = "instead, use 'http_cors_override', see https://prosody.im/doc/http#cross-domain-cors-support";
+			cross_domain_websocket = "instead, use 'http_cors_override', see https://prosody.im/doc/http#cross-domain-cors-support";
 		};
 		-- FIXME all the singular _port and _interface options are supposed to be deprecated too
 		local deprecated_ports = { bosh = "http", legacy_ssl = "c2s_direct_tls" };