From 3c269e5feae2fda4fc1f5cf7b987a21f7a590695 Mon Sep 17 00:00:00 2001
From: James Rodewig <james.rodewig@elastic.co>
Date: Wed, 29 May 2019 08:44:36 -0400
Subject: [PATCH] Revert "[DOCS] Set explicit anchors for TLS/SSL settings
 (#42524)"

This reverts commit 7d2ff99d57637bd11470eb51b33f196a5f89d08b.
---
 .../settings/monitoring-settings.asciidoc     |  1 -
 .../settings/notification-settings.asciidoc   |  1 -
 .../settings/security-settings.asciidoc       |  2 --
 docs/reference/settings/ssl-settings.asciidoc | 19 +------------------
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/docs/reference/settings/monitoring-settings.asciidoc b/docs/reference/settings/monitoring-settings.asciidoc
index 43ec9906c10c2..d1d46e67f77b0 100644
--- a/docs/reference/settings/monitoring-settings.asciidoc
+++ b/docs/reference/settings/monitoring-settings.asciidoc
@@ -285,6 +285,5 @@ For example: `["elasticsearch_version_mismatch","xpack_license_expiration"]`.
 :component:              {monitoring}
 :verifies:
 :server!:
-:ssl-context:            monitoring
 
 include::ssl-settings.asciidoc[]
diff --git a/docs/reference/settings/notification-settings.asciidoc b/docs/reference/settings/notification-settings.asciidoc
index 9a99c78a88c33..70ee63d81fc2a 100644
--- a/docs/reference/settings/notification-settings.asciidoc
+++ b/docs/reference/settings/notification-settings.asciidoc
@@ -71,7 +71,6 @@ Specifies the maximum size an HTTP response is allowed to have, defaults to
 :component:              {watcher}
 :verifies:
 :server!:
-:ssl-context:            watcher
 
 include::ssl-settings.asciidoc[]
 
diff --git a/docs/reference/settings/security-settings.asciidoc b/docs/reference/settings/security-settings.asciidoc
index 4b3a5c9b7a962..355e7f95e86a9 100644
--- a/docs/reference/settings/security-settings.asciidoc
+++ b/docs/reference/settings/security-settings.asciidoc
@@ -1465,7 +1465,6 @@ http layer.
 :client-auth-default:    none
 :verifies!:
 :server:
-:ssl-context:            security-http
 
 include::ssl-settings.asciidoc[]
 
@@ -1475,7 +1474,6 @@ include::ssl-settings.asciidoc[]
 :client-auth-default!:
 :verifies:
 :server:
-:ssl-context:            security-transport
 
 include::ssl-settings.asciidoc[]
 
diff --git a/docs/reference/settings/ssl-settings.asciidoc b/docs/reference/settings/ssl-settings.asciidoc
index e77ccf147d151..6d61cd4a784ef 100644
--- a/docs/reference/settings/ssl-settings.asciidoc
+++ b/docs/reference/settings/ssl-settings.asciidoc
@@ -1,3 +1,4 @@
+
 ==== {component} TLS/SSL Settings
 ifeval::["{component}"=="Auditing"]
 ifdef::asciidoctor[]
@@ -51,13 +52,7 @@ Supported cipher suites can be found in Oracle's http://docs.oracle.com/javase/8
 Java Cryptography Architecture documentation]. Defaults to the value of
 `xpack.ssl.cipher_suites`.
 
-ifdef::asciidoctor[]
-[#{ssl-context}-tls-ssl-key-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
 trusted certificates that should be used when communicating over an SSL/TLS connection.
@@ -123,13 +118,7 @@ Password to the truststore.
 +{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
 Password to the truststore.
 
-ifdef::asciidoctor[]
-[#{ssl-context}-pkcs12-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)
 that contain the private key, certificate and certificates that should be trusted.
@@ -167,13 +156,7 @@ Password to the PKCS#12 file.
 +{ssl-prefix}.ssl.truststore.secure_password+ (<<secure-settings,Secure>>)::
 Password to the PKCS#12 file.
 
-ifdef::asciidoctor[]
-[#{ssl-context}-pkcs11-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,
 certificate and certificates that should be trusted.