From 105df0c8e4a354efb77ab52c7ea054a49293e59e Mon Sep 17 00:00:00 2001 From: mmattel Date: Fri, 12 Jul 2024 16:13:05 +0200 Subject: [PATCH 1/2] [docs-only] [5.0] Docs adoc template: make a space between deprecations and standard --- docs/templates/ADOC.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/templates/ADOC.tmpl b/docs/templates/ADOC.tmpl index 7ba5d3b1263..753862d4674 100644 --- a/docs/templates/ADOC.tmpl +++ b/docs/templates/ADOC.tmpl @@ -1,4 +1,6 @@ // set the attribute to true or leave empty, true without any quotes. +// if the generated adoc file is used outside tabs, it renders correctly depending on the attribute set. +// if inside, you need additioanlly use the xxx_deprecation.adoc file. attributes cant be defined inside tabs. :show-deprecation: {{ .HasDeprecations }} @@ -23,6 +25,8 @@ ifeval::[{show-deprecation} == true] {{- end }} |=== +{empty} + + endif::[] [caption=] From 79f929236cd23fd52961ea502bdc7defef8271f3 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 12 Jul 2024 16:18:19 +0200 Subject: [PATCH 2/2] Update docs/templates/ADOC.tmpl Co-authored-by: Phil Davis --- docs/templates/ADOC.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/ADOC.tmpl b/docs/templates/ADOC.tmpl index 753862d4674..99d6921323b 100644 --- a/docs/templates/ADOC.tmpl +++ b/docs/templates/ADOC.tmpl @@ -1,6 +1,6 @@ // set the attribute to true or leave empty, true without any quotes. // if the generated adoc file is used outside tabs, it renders correctly depending on the attribute set. -// if inside, you need additioanlly use the xxx_deprecation.adoc file. attributes cant be defined inside tabs. +// if inside, you need to also use the xxx_deprecation.adoc file. attributes can't be defined inside tabs. :show-deprecation: {{ .HasDeprecations }}