From 9d4f56c30ca212bcb3db068cdc2be5f899f07818 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Fri, 26 Apr 2019 17:23:07 -0400 Subject: [PATCH 1/3] [DOCS] Add {empty} to format multiple inline macros --- docs/reference/settings/notification-settings.asciidoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index f08d4e1ff9951..6fa338bca7e11 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -35,8 +35,10 @@ required. For more information, see {xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}]. `xpack.watcher.history.cleaner_service.enabled`:: -added[6.3.0,Default changed to `true`.] -deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] +// {empty} attributes are included so both macros render as intended. +// Removing the attributes will break their display in Asciidoctor. +added[6.3.0,Default changed to `true`.] {empty} +deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] {empty} + Set to `true` (default) to enable the cleaner service. If this setting is `true`, the `xpack.monitoring.enabled` setting must also be set to `true` with From f31252bfc6b024dcf9cb4ae86089f10f7487b4d7 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 1 May 2019 14:08:46 -0400 Subject: [PATCH 2/3] [DOCS] Add `:` to macros for Asciidoctor migration --- docs/reference/settings/notification-settings.asciidoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index 6fa338bca7e11..8045f31caa0df 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -35,10 +35,8 @@ required. For more information, see {xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}]. `xpack.watcher.history.cleaner_service.enabled`:: -// {empty} attributes are included so both macros render as intended. -// Removing the attributes will break their display in Asciidoctor. -added[6.3.0,Default changed to `true`.] {empty} -deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] {empty} +added:[6.3.0,Default changed to `true`.] +deprecated:[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] + Set to `true` (default) to enable the cleaner service. If this setting is `true`, the `xpack.monitoring.enabled` setting must also be set to `true` with From f7ba3b059155fe60c48f74d3972ad7c9aca179b8 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Wed, 1 May 2019 14:23:38 -0400 Subject: [PATCH 3/3] [DOCS] Add conditionals to support AsciiDoc until Asciidoctor migration --- docs/reference/settings/notification-settings.asciidoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc index 8045f31caa0df..da7c1d3c11094 100644 --- a/docs/reference/settings/notification-settings.asciidoc +++ b/docs/reference/settings/notification-settings.asciidoc @@ -35,8 +35,14 @@ required. For more information, see {xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}]. `xpack.watcher.history.cleaner_service.enabled`:: +ifdef::asciidoctor[] added:[6.3.0,Default changed to `true`.] deprecated:[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] +endif::[] +ifndef::asciidoctor[] +added[6.3.0,Default changed to `true`.] +deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy] +endif::[] + Set to `true` (default) to enable the cleaner service. If this setting is `true`, the `xpack.monitoring.enabled` setting must also be set to `true` with