Merge branch 'main' into fix-apm-dead-links

Author: colleenmcginnis

deploy-manage/deploy/cloud-on-k8s/configuration-examples-fleet.md

@@ -12,16 +12,16 @@ The examples in this section are for illustration purposes only and should not b
 ::::
 
 
-## System and {{k8s}} {integrations} [k8s_system_and_k8s_integrations]
+## System and {{k8s}} {{integrations}} [k8s_system_and_k8s_integrations]
 
 ```sh
 kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/2.16/config/recipes/elastic-agent/fleet-kubernetes-integration.yaml
 ```
 
-Deploys {{agent}} as a DaemonSet in {{fleet}} mode with System and {{k8s}} {integrations} enabled. System integration collects syslog logs, auth logs and system metrics (for CPU, I/O, filesystem, memory, network, process and others). {{k8s}} {integrations} collects API server, Container, Event, Node, Pod, Volume and system metrics.
+Deploys {{agent}} as a DaemonSet in {{fleet}} mode with System and {{k8s}} {{integrations}} enabled. System integration collects syslog logs, auth logs and system metrics (for CPU, I/O, filesystem, memory, network, process and others). {{k8s}} {{integrations}} collects API server, Container, Event, Node, Pod, Volume and system metrics.
 
 
-## System and {{k8s}} {integrations} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
+## System and {{k8s}} {{integrations}} running as non-root [k8s_system_and_k8s_integrations_running_as_non_root]
 
 ```sh
 kubectl apply -f https://raw.githubusercontent.com/elastic/cloud-on-k8s/2.16/config/recipes/elastic-agent/fleet-kubernetes-integration-nonroot.yaml

deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md

@@ -216,7 +216,7 @@ roleRef:
 
 ## Deploy {{agent}} in secured clusters [k8s-elastic-agent-fleet-configuration-deploying-in-secured-clusters]
 
-To deploy {{agent}} in clusters with the Pod Security Policy admission controller enabled, or in [OpenShift](k8s-openshift-agent.md) clusters, you might need to grant additional permissions to the Service Account used by the {{agent}} Pods. Those Service Accounts must be bound to a Role or ClusterRole that has `use` permission for the required Pod Security Policy or Security Context Constraints. Different {{agent}} {integrations} might require different settings set in their PSP/[SCC](k8s-openshift-agent.md).
+To deploy {{agent}} in clusters with the Pod Security Policy admission controller enabled, or in [OpenShift](k8s-openshift-agent.md) clusters, you might need to grant additional permissions to the Service Account used by the {{agent}} Pods. Those Service Accounts must be bound to a Role or ClusterRole that has `use` permission for the required Pod Security Policy or Security Context Constraints. Different {{agent}} {{integrations}} might require different settings set in their PSP/[SCC](k8s-openshift-agent.md).
 
 
 ## Customize {{fleet-server}} Service [k8s-elastic-agent-fleet-configuration-customize-fleet-server-service]

deploy-manage/deploy/cloud-on-k8s/k8s_prerequisites.md

@@ -172,7 +172,7 @@ spec:
       podSelector:
         matchLabels:
           common.k8s.elastic.co/type: elasticsearch
-          # [Optional] Restrict to a single {es} cluster named hulk.
+          # [Optional] Restrict to a single {{es}} cluster named hulk.
           # elasticsearch.k8s.elastic.co/cluster-name=hulk
   - ports:
     - port: 53

deploy-manage/deploy/elastic-cloud/azure-native-isv-service.md

@@ -298,7 +298,7 @@ $$$azure-integration-whats-included$$$What is included in my {{ecloud}} deployme
 :   Each {{ecloud}} deployment includes:
 
     * An {{es}} cluster
-    * A {{kib}} instance which provides data visualization and a front-end for the {stack}
+    * A {{kib}} instance which provides data visualization and a front-end for the {{stack}}
     * An APM server that allows you to easily collect application traces
     * An {{ents}} instance that allows you to easily build a search experience with an intuitive interface
 

deploy-manage/deploy/self-managed/configure-elasticsearch.md

@@ -14,7 +14,7 @@ The configuration files should contain settings which are node-specific (such as
 
 {{es}} has three configuration files:
 
-* `elasticsearch.yml` for configuring {es}
+* `elasticsearch.yml` for configuring {{es}}
 * `jvm.options` for configuring {{es}} JVM settings
 * `log4j2.properties` for configuring {{es}} logging
 

deploy-manage/deploy/self-managed/install-elasticsearch-with-docker.md

@@ -202,11 +202,11 @@ To remove the containers and their network, run:
 # Remove the Elastic network
 docker network rm elastic
 
-# Remove {es} containers
+# Remove {{es}} containers
 docker rm es01
 docker rm es02
 
-# Remove the {kib} container
+# Remove the {{kib}} container
 docker rm kib01
 ```
 

deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md

@@ -10,7 +10,7 @@ mapped_pages:
 This package contains both free and subscription features. [Start a 30-day trial](https://www.elastic.co/guide/en/elasticsearch/reference/current/license-settings.html) to try out all of the features.
 
 ::::{note}
-On Windows the {{es}} {ml} feature requires the Microsoft Universal C Runtime library. This is built into Windows 10, Windows Server 2016 and more recent versions of Windows. For older versions of Windows it can be installed via Windows Update, or from a [separate download](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you cannot install the Microsoft Universal C Runtime library you can still use the rest of {{es}} if you disable the {{ml}} feature.
+On Windows the {{es}} {{ml}} feature requires the Microsoft Universal C Runtime library. This is built into Windows 10, Windows Server 2016 and more recent versions of Windows. For older versions of Windows it can be installed via Windows Update, or from a [separate download](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows). If you cannot install the Microsoft Universal C Runtime library you can still use the rest of {{es}} if you disable the {{ml}} feature.
 ::::
 
 

deploy-manage/deploy/self-managed/install-with-docker.md

@@ -151,10 +151,10 @@ To remove the containers and their network, run:
 # Remove the Elastic network
 docker network rm elastic
 
-# Remove the {es} container
+# Remove the {{es}} container
 docker rm es01
 
-# Remove the {kib} container
+# Remove the {{kib}} container
 docker rm kib01
 ```
 

deploy-manage/monitor/monitoring-data/kibana-alerts.md

@@ -12,17 +12,17 @@ applies:
 
 # Kibana alerts [kibana-alerts]
 
-The {{stack}} {monitor-features} provide [Alerting rules](../../../explore-analyze/alerts-cases/alerts.md) out-of-the box to notify you of potential issues in the {{stack}}. These rules are preconfigured based on the best practices recommended by Elastic. However, you can tailor them to meet your specific needs.
+The {{stack}} {{monitor-features}} provide [Alerting rules](../../../explore-analyze/alerts-cases/alerts.md) out-of-the box to notify you of potential issues in the {{stack}}. These rules are preconfigured based on the best practices recommended by Elastic. However, you can tailor them to meet your specific needs.
 
 :::{image} ../../../images/kibana-monitoring-kibana-alerting-notification.png
-:alt: {{kib}} alerting notifications in {stack-monitor-app}
+:alt: {{kib}} alerting notifications in {{stack-monitor-app}}
 :class: screenshot
 :::
 
 When you open **{{stack-monitor-app}}** for the first time, you will be asked to acknowledge the creation of these default rules. They are initially configured to detect and notify on various conditions across your monitored clusters. You can view notifications for: **Cluster health**, **Resource utilization**, and **Errors and exceptions** for {{es}} in real time.
 
 ::::{note}
-The default {{watcher}} based "cluster alerts" for {{stack-monitor-app}} have been recreated as rules in {{kib}} {alert-features}. For this reason, the existing {{watcher}} email action `monitoring.cluster_alerts.email_notifications.email_address` no longer works. The default action for all {{stack-monitor-app}} rules is to write to {{kib}} logs and display a notification in the UI.
+The default {{watcher}} based "cluster alerts" for {{stack-monitor-app}} have been recreated as rules in {{kib}} {{alert-features}}. For this reason, the existing {{watcher}} email action `monitoring.cluster_alerts.email_notifications.email_address` no longer works. The default action for all {{stack-monitor-app}} rules is to write to {{kib}} logs and display a notification in the UI.
 ::::
 
 

deploy-manage/monitor/monitoring-data/monitor-troubleshooting.md

@@ -12,7 +12,7 @@ applies:
 # Troubleshooting [monitor-troubleshooting]
 
 
-Use the information in this section to troubleshoot common problems and find answers for frequently asked questions related to the {{kib}} {monitor-features}.
+Use the information in this section to troubleshoot common problems and find answers for frequently asked questions related to the {{kib}} {{monitor-features}}.
 
 
 ## Cannot view the cluster because the license information is invalid [_cannot_view_the_cluster_because_the_license_information_is_invalid]