[DOCS] Remove unneeded `ifdef::asciidoctor[]` conditionals (#42758)
Several `ifdef::asciidoctor` conditionals were added so that AsciiDoc and Asciidoctor doc builds rendered consistently. With https://github.com/elastic/docs/pull/827, Elasticsearch Reference documentation migrated completely to Asciidoctor. We no longer need to support AsciiDoc so we can remove these conditionals. Resolves #41722
This commit is contained in:
parent
87ca762573
commit
478919c0bb
|
@ -37,14 +37,8 @@ required. For more information, see
|
||||||
{xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}].
|
{xpack-ref}/encrypting-data.html[Encrypting sensitive data in {watcher}].
|
||||||
|
|
||||||
`xpack.watcher.history.cleaner_service.enabled`::
|
`xpack.watcher.history.cleaner_service.enabled`::
|
||||||
ifdef::asciidoctor[]
|
|
||||||
added:[6.3.0,Default changed to `true`.]
|
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]
|
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
|
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
|
`true`, the `xpack.monitoring.enabled` setting must also be set to `true` with
|
||||||
|
|
|
@ -38,13 +38,8 @@ endif::verifies[]
|
||||||
Supported cipher suites can be found in Oracle's http://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html[
|
Supported cipher suites can be found in Oracle's http://docs.oracle.com/javase/8/docs/technotes/guides/security/SunProviders.html[
|
||||||
Java Cryptography Architecture documentation]. Defaults to ``.
|
Java Cryptography Architecture documentation]. Defaults to ``.
|
||||||
|
|
||||||
ifdef::asciidoctor[]
|
|
||||||
[#{ssl-context}-tls-ssl-key-trusted-certificate-settings]
|
[#{ssl-context}-tls-ssl-key-trusted-certificate-settings]
|
||||||
===== {component} TLS/SSL Key and Trusted Certificate Settings
|
===== {component} TLS/SSL Key and Trusted Certificate Settings
|
||||||
endif::[]
|
|
||||||
ifndef::asciidoctor[]
|
|
||||||
===== anchor:{ssl-context}-tls-ssl-key-trusted-certificate-settings[] {component} TLS/SSL Key and Trusted Certificate Settings
|
|
||||||
endif::[]
|
|
||||||
|
|
||||||
The following settings are used to specify a private key, certificate, and the
|
The following settings are used to specify a private key, certificate, and the
|
||||||
trusted certificates that should be used when communicating over an SSL/TLS connection.
|
trusted certificates that should be used when communicating over an SSL/TLS connection.
|
||||||
|
@ -110,13 +105,8 @@ Password to the truststore.
|
||||||
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
|
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
|
||||||
Password to the truststore.
|
Password to the truststore.
|
||||||
|
|
||||||
ifdef::asciidoctor[]
|
|
||||||
[#{ssl-context}-pkcs12-files]
|
[#{ssl-context}-pkcs12-files]
|
||||||
===== PKCS#12 Files
|
===== PKCS#12 Files
|
||||||
endif::[]
|
|
||||||
ifndef::asciidoctor[]
|
|
||||||
===== anchor:{ssl-context}-pkcs12-files[] PKCS#12 Files
|
|
||||||
endif::[]
|
|
||||||
|
|
||||||
{es} can be configured to use PKCS#12 container files (`.p12` or `.pfx` files)
|
{es} can be configured to use PKCS#12 container files (`.p12` or `.pfx` files)
|
||||||
that contain the private key, certificate and certificates that should be trusted.
|
that contain the private key, certificate and certificates that should be trusted.
|
||||||
|
@ -154,13 +144,8 @@ Password to the PKCS#12 file.
|
||||||
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
|
+{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
|
||||||
Password to the PKCS#12 file.
|
Password to the PKCS#12 file.
|
||||||
|
|
||||||
ifdef::asciidoctor[]
|
|
||||||
[#{ssl-context}-pkcs11-tokens]
|
[#{ssl-context}-pkcs11-tokens]
|
||||||
===== PKCS#11 Tokens
|
===== PKCS#11 Tokens
|
||||||
endif::[]
|
|
||||||
ifndef::asciidoctor[]
|
|
||||||
===== anchor:{ssl-context}-pkcs11-tokens[] PKCS#11 Tokens
|
|
||||||
endif::[]
|
|
||||||
|
|
||||||
{es} can be configured to use a PKCS#11 token that contains the private key,
|
{es} can be configured to use a PKCS#11 token that contains the private key,
|
||||||
certificate and certificates that should be trusted.
|
certificate and certificates that should be trusted.
|
||||||
|
|
Loading…
Reference in New Issue