Merge branch 'main' into ben-migration-cleanup-cloudsec

Author: natasha-moore-elastic

cloud-account/change-your-password.md

@@ -8,7 +8,7 @@ applies:
 
 # Change your password [ec-change-password]
 
-If you created a password when you signed up for a {{ecloud}} account, or you added the password-based login method to your account, then you can change your password if needed.
+If you created a password when you signed up for an {{ecloud}} account, or you added the password-based login method to your account, then you can change your password if needed.
 
 If you know your current password:
 

deploy-manage/api-keys/elastic-cloud-enterprise-api-keys.md

@@ -70,5 +70,5 @@ To create a bearer token:
     { "token": "eyJ0eXa...<very long string>...MgBmsw4s" }
     ```
 
-2. Specify the bearer token in the Authentication header of your API requests. To learn more, check [accessing the API from the command line](asciidocalypse://docs/cloud/docs/reference/cloud/cloud-enterprise/ece-api-command-line.md).
+2. Specify the bearer token in the Authentication header of your API requests. To learn more, check [accessing the API from the command line](asciidocalypse://docs/cloud/docs/reference/cloud-enterprise/ece-api-command-line.md).
 

deploy-manage/autoscaling/ec-autoscaling-api-example.md

@@ -5,9 +5,9 @@ mapped_pages:
 
 # Autoscaling through the API [ec-autoscaling-api-example]
 
-This example demonstrates how to use the Elasticsearch Service RESTful API to create a deployment with autoscaling enabled.
+This example demonstrates how to use the {{ecloud}} RESTful API to create a deployment with autoscaling enabled.
 
-The example deployment has a hot data and content tier, warm data tier, cold data tier, and a machine learning node, all of which will scale within the defined parameters. To learn about the autoscaling settings, check [Deployment autoscaling](../autoscaling.md) and [Autoscaling example](ec-autoscaling-example.md). For more information about using the Elasticsearch Service API in general, check [RESTful API](asciidocalypse://docs/cloud/docs/reference/cloud/cloud-hosted/ec-api-restful.md).
+The example deployment has a hot data and content tier, warm data tier, cold data tier, and a machine learning node, all of which will scale within the defined parameters. To learn about the autoscaling settings, check [Deployment autoscaling](../autoscaling.md) and [Autoscaling example](ec-autoscaling-example.md). For more information about using the {{ecloud}} API in general, check [RESTful API](asciidocalypse://docs/cloud/docs/reference/cloud-hosted/ec-api-restful.md).
 
 
 ## Requirements [ec_requirements] 
@@ -46,7 +46,7 @@ $$$ec-autoscaling-api-example-requirements-table$$$
 
 + ✕ = Do not include the property.
 
-+ These rules match the behavior of the Elasticsearch Service user console.
++ These rules match the behavior of the {{ecloud}} Console.
 
 + * The `elasticsearch` object must contain the property `"autoscaling_enabled": true`.
 

deploy-manage/autoscaling/ec-autoscaling-example.md

@@ -5,7 +5,7 @@ mapped_pages:
 
 # Autoscaling example [ec-autoscaling-example]
 
-To help you better understand the available autoscaling settings, this example describes a typical autoscaling workflow on sample Elasticsearch Service deployment.
+To help you better understand the available autoscaling settings, this example describes a typical autoscaling workflow on sample {{ech}} deployment.
 
 1. Enable autoscaling:
 

deploy-manage/autoscaling/ec-autoscaling.md

@@ -45,7 +45,7 @@ Currently, autoscaling behavior is as follows:
 
 
 ::::{note}
-For any Elasticsearch Service Elasticsearch component the number of availability zones is not affected by autoscaling. You can always set the number of availability zones manually and the autoscaling mechanism will add or remove capacity per availability zone.
+The number of availability zones for each component of your {{ech}} deployments is not affected by autoscaling. You can always set the number of availability zones manually and the autoscaling mechanism will add or remove capacity per availability zone.
 ::::
 
 
@@ -85,10 +85,10 @@ The following are known limitations and restrictions with autoscaling:
 
 To enable or disable autoscaling on a deployment:
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Deployments** page, select your deployment.
 
-    On the deployments page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
+    On the **Deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
 
 3. In your deployment menu, select **Edit**.
 4. Select desired autoscaling configuration for this deployment using **Enable Autoscaling for:** dropdown menu.
@@ -103,10 +103,10 @@ When autoscaling has been disabled, you need to adjust the size of data tiers an
 
 Each autoscaling setting is configured with a default value. You can adjust these if necessary, as follows:
 
-1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+1. Log in to the [{{ecloud}} Console](https://cloud.elastic.co?page=docs&placement=docs-body).
 2. On the **Deployments** page, select your deployment.
 
-    On the deployments page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
+    On the **Deployments** page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
 
 3. In your deployment menu, select **Edit**.
 4. To update a data tier:

deploy-manage/autoscaling/ece-autoscaling-api-example.md

@@ -7,7 +7,7 @@ mapped_pages:
 
 This example demonstrates how to use the Elastic Cloud Enterprise RESTful API to create a deployment with autoscaling enabled.
 
-The example deployment has a hot data and content tier, warm data tier, cold data tier, and a machine learning node, all of which will scale within the defined parameters. To learn about the autoscaling settings, check [Deployment autoscaling](../autoscaling.md) and [Autoscaling example](ece-autoscaling-example.md). For more information about using the Elastic Cloud Enterprise API in general, check [RESTful API](asciidocalypse://docs/cloud/docs/reference/cloud/cloud-enterprise/restful-api.md).
+The example deployment has a hot data and content tier, warm data tier, cold data tier, and a machine learning node, all of which will scale within the defined parameters. To learn about the autoscaling settings, check [Deployment autoscaling](../autoscaling.md) and [Autoscaling example](ece-autoscaling-example.md). For more information about using the Elastic Cloud Enterprise API in general, check [RESTful API](asciidocalypse://docs/cloud/docs/reference/cloud-enterprise/restful-api.md).
 
 
 ## Requirements [ece_requirements_3] 

deploy-manage/cloud-organization.md

@@ -1,9 +1,10 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-organizations.html
-applies:
+applies_to:
+  deployment:
+    ess: all
   serverless: all
-  hosted: all
 ---
 
 # Manage your Cloud organization [ec-organizations]

deploy-manage/cloud-organization/billing.md

@@ -2,9 +2,10 @@
 mapped_urls:
   - https://www.elastic.co/guide/en/cloud/current/ec-billing.html
   - https://www.elastic.co/guide/en/serverless/current/general-manage-billing.html
-applies:
+applies_to:
+  deployment:
+    ess: all
   serverless: all
-  hosted: all
 ---
 
 # Billing

deploy-manage/cloud-organization/billing/add-billing-details.md

@@ -1,8 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-billing-details.html
-applies:
-  hosted: all
+applies_to:
+  deployment:
+    ess: all
   serverless: all
 ---
 

deploy-manage/cloud-organization/billing/billing-faq.md

@@ -1,8 +1,9 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-billing.html
-applies:
-  hosted: all
+applies_to:
+  deployment:
+    ess: all
   serverless: all
 ---