From ab1470b5c531cf5b3aca2365f74c8dbe62da1767 Mon Sep 17 00:00:00 2001 From: Yang Wang Date: Fri, 29 Mar 2024 23:16:39 +1100 Subject: [PATCH] [Doc] Remove invalid watcher ssl enabled settings (#106901) (#106906) In #99115 we updated the ssl settings template to cover new features. It inadvertently introduced a doc bug that show invalied ssl.enabled settings for watcher HTTP and email. This PR removes them. --- docs/reference/settings/notification-settings.asciidoc | 2 ++ docs/reference/settings/ssl-settings.asciidoc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index af6636606630a..4a48c26974084 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -95,6 +95,7 @@ corresponding endpoints are explicitly allowed as well. :verifies: :server!: :ssl-context: watcher +:no-enabled-setting: include::ssl-settings.asciidoc[] @@ -284,6 +285,7 @@ Defaults to `Warning: The attachment [%s] contains characters which spreadsheet :verifies: :server!: :ssl-context: watcher-email +:no-enabled-setting: include::ssl-settings.asciidoc[] diff --git a/docs/reference/settings/ssl-settings.asciidoc b/docs/reference/settings/ssl-settings.asciidoc index 2c0eef7077f4d..2ab32c1a65c2d 100644 --- a/docs/reference/settings/ssl-settings.asciidoc +++ b/docs/reference/settings/ssl-settings.asciidoc @@ -1,6 +1,7 @@ ==== {component} TLS/SSL settings You can configure the following TLS/SSL settings. +ifndef::no-enabled-setting[] +{ssl-prefix}.ssl.enabled+:: (<>) Used to enable or disable TLS/SSL on the {ssl-layer}. @@ -10,6 +11,7 @@ endif::enabled-by-default[] ifndef::enabled-by-default[] The default is `false`. endif::enabled-by-default[] +endif::no-enabled-setting[] +{ssl-prefix}.ssl.supported_protocols+:: (<>)