Skip to content

Commit 931492d

Browse files
authored
[DOCS] Remove unneeded ifdef::asciidoctor[] conditionals (#42758)
Several `ifdef::asciidoctor` conditionals were added so that AsciiDoc and Asciidoctor doc builds rendered consistently. With elastic/docs#827, Elasticsearch Reference documentation migrated completely to Asciidoctor. We no longer need to support AsciiDoc so we can remove these conditionals. Resolves #41722
1 parent fddeb0c commit 931492d

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

docs/reference/settings/notification-settings.asciidoc

-6
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,8 @@ required. For more information, see
3737
{xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}].
3838

3939
`xpack.watcher.history.cleaner_service.enabled`::
40-
ifdef::asciidoctor[]
4140
added:[6.3.0,Default changed to `true`.]
4241
deprecated:[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy]
43-
endif::[]
44-
ifndef::asciidoctor[]
45-
added[6.3.0,Default changed to `true`.]
46-
deprecated[7.0.0,Watcher history indices are now managed by the `watch-history-ilm-policy` ILM policy]
47-
endif::[]
4842
+
4943
Set to `true` (default) to enable the cleaner service. If this setting is
5044
`true`, the `xpack.monitoring.enabled` setting must also be set to `true` with

docs/reference/settings/ssl-settings.asciidoc

-15
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ endif::verifies[]
3838
Supported cipher suites can be found in Oracle's http://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html[
3939
Java Cryptography Architecture documentation]. Defaults to ``.
4040

41-
ifdef::asciidoctor[]
4241
[#{ssl-context}-tls-ssl-key-trusted-certificate-settings]
4342
===== {component} TLS/SSL Key and Trusted Certificate Settings
44-
endif::[]
45-
ifndef::asciidoctor[]
46-
===== anchor:{ssl-context}-tls-ssl-key-trusted-certificate-settings[] {component} TLS/SSL Key and Trusted Certificate Settings
47-
endif::[]
4843

4944
The following settings are used to specify a private key, certificate, and the
5045
trusted certificates that should be used when communicating over an SSL/TLS connection.
@@ -110,13 +105,8 @@ Password to the truststore.
110105
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
111106
Password to the truststore.
112107

113-
ifdef::asciidoctor[]
114108
[#{ssl-context}-pkcs12-files]
115109
===== PKCS#12 Files
116-
endif::[]
117-
ifndef::asciidoctor[]
118-
===== anchor:{ssl-context}-pkcs12-files[] PKCS#12 Files
119-
endif::[]
120110

121111
{es} can be configured to use PKCS#12 container files (`.p12` or `.pfx` files)
122112
that contain the private key, certificate and certificates that should be trusted.
@@ -154,13 +144,8 @@ Password to the PKCS#12 file.
154144
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
155145
Password to the PKCS#12 file.
156146

157-
ifdef::asciidoctor[]
158147
[#{ssl-context}-pkcs11-tokens]
159148
===== PKCS#11 Tokens
160-
endif::[]
161-
ifndef::asciidoctor[]
162-
===== anchor:{ssl-context}-pkcs11-tokens[] PKCS#11 Tokens
163-
endif::[]
164149

165150
{es} can be configured to use a PKCS#11 token that contains the private key,
166151
certificate and certificates that should be trusted.

0 commit comments

Comments
 (0)