From 58788714634634303e5fdbda813f9ab5853b7c99 Mon Sep 17 00:00:00 2001 From: monochromec Date: Mon, 4 Mar 2024 15:05:19 +0100 Subject: [PATCH 1/3] mail_domain configuration clarification Signed-off-by: monochromec --- .../configuration_server/config_sample_php_parameters.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index a9e1e23e6..e240cec89 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -736,7 +736,9 @@ mail_domain The return address that you want to appear on emails sent by the Nextcloud server, for example ``nc-admin@example.com``, substituting your own domain, -of course. +of course. Please note that this is *not* the domain used for the SMTP protocol handhshake. +So if you want to have the server responding with an EHLO reply identifiying itself properly, +please configure ``overwrite.cli.url``_ accordingly. mail_from_address ^^^^^^^^^^^^^^^^^ @@ -995,7 +997,7 @@ addresses starting with ``10.0.0.`` and ending with 1 to 3: Defaults to ``''`` (empty string) -overwrite.cli.url +.. _overwrite.cli.url ^^^^^^^^^^^^^^^^^ From 27b1d39753b97ff587d133eb1d10fd17ea9e2ba4 Mon Sep 17 00:00:00 2001 From: monochromec Date: Mon, 4 Mar 2024 15:27:37 +0100 Subject: [PATCH 2/3] Fixed markup Signed-off-by: monochromec --- .../configuration_server/config_sample_php_parameters.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index e240cec89..e625cb37b 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -738,7 +738,7 @@ The return address that you want to appear on emails sent by the Nextcloud server, for example ``nc-admin@example.com``, substituting your own domain, of course. Please note that this is *not* the domain used for the SMTP protocol handhshake. So if you want to have the server responding with an EHLO reply identifiying itself properly, -please configure ``overwrite.cli.url``_ accordingly. +please configure ``overwrite.cli.url`` accordingly. mail_from_address ^^^^^^^^^^^^^^^^^ From b5fb29d247a5cd485a238bd71feda0ca158f6375 Mon Sep 17 00:00:00 2001 From: monochromec Date: Mon, 4 Mar 2024 19:14:51 +0100 Subject: [PATCH 3/3] Fixed malformed link Signed-off-by: monochromec --- .../configuration_server/config_sample_php_parameters.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index e625cb37b..57c2f4bc7 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -997,7 +997,7 @@ addresses starting with ``10.0.0.`` and ending with 1 to 3: Defaults to ``''`` (empty string) -.. _overwrite.cli.url +overwrite.cli.url ^^^^^^^^^^^^^^^^^