From 9d37a86bdd26c8a72e03beb9a852f35fcb3c3985 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Fri, 16 Dec 2022 16:12:51 +0000 Subject: [PATCH] ejabberd_options_doc.erl: Added outgoing_s2s_families deprecation notice. Signed-off-by: Jonathan Davies --- man/ejabberd.yml.5 | 2 ++ src/ejabberd_options_doc.erl | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/man/ejabberd.yml.5 b/man/ejabberd.yml.5 index b760c5af4..c3f7cb289 100644 --- a/man/ejabberd.yml.5 +++ b/man/ejabberd.yml.5 @@ -1208,6 +1208,8 @@ percents\&. Specify which address families to try, in what order\&. The default is \fI[ipv6, ipv4]\fR which means it first tries connecting with IPv6, if that fails it tries using IPv4\&. +.PP +NOTE: This option is obsolete and irrelevant when using ejabberd 23.xx and Erlang/OTP 22, or newer versions of them. .RE .sp \fINote\fR about the next option: added in 20\&.12: diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl index 03aa78fb2..2558991b4 100644 --- a/src/ejabberd_options_doc.erl +++ b/src/ejabberd_options_doc.erl @@ -969,7 +969,9 @@ doc() -> desc => ?T("Specify which address families to try, in what order. " "The default is '[ipv4, ipv6]' which means it first tries " - "connecting with IPv4, if that fails it tries using IPv6.")}}, + "connecting with IPv4, if that fails it tries using IPv6." + "This option is obsolete and irrelevant when using ejabberd 23.xx " + "and Erlang/OTP 22, or newer versions of them.")}}, {outgoing_s2s_ipv4_address, #{value => "Address", note => "added in 20.12",