diff --git a/deploy-manage/api-keys.md b/deploy-manage/api-keys.md
index 68bd645396..8ec5242ff2 100644
--- a/deploy-manage/api-keys.md
+++ b/deploy-manage/api-keys.md
@@ -1,6 +1,5 @@
 ---
 applies_to:
-  stack: ga
   deployment:
     eck: ga
     ess: ga
@@ -9,14 +8,7 @@ applies_to:
   serverless: ga
 ---
 
-# Manage API keys
-
-% What needs to be done: Write from scratch
-
-% GitHub issue: https://github.com/elastic/docs-projects/issues/349
-
-% Scope notes: Elasticsearch & Kibana authentication API Keys
-
+# API keys
 
 API keys are security mechanisms used to authenticate and authorize access to your deployments and {{es}} resources. 
 
diff --git a/deploy-manage/cloud-organization.md b/deploy-manage/cloud-organization.md
index d786616821..b022b7717e 100644
--- a/deploy-manage/cloud-organization.md
+++ b/deploy-manage/cloud-organization.md
@@ -9,7 +9,7 @@ applies_to:
 
 # Manage your Cloud organization [ec-organizations]
 
-When you sign up to {{ecloud}}, you create an organization. This organization is the umbrella for all of your {{ecloud}} resources, users, and account settings. Every organization has a unique identifier. 
+When you [sign up for {{ecloud}}](/deploy-manage/deploy/elastic-cloud/create-an-organization.md), you create an organization. This organization is the umbrella for all of your {{ecloud}} resources, users, and account settings. Every organization has a unique identifier. 
 
 You can perform the following tasks to manage your Cloud organization:
 
diff --git a/deploy-manage/deploy.md b/deploy-manage/deploy.md
index 52702cced3..61b9246964 100644
--- a/deploy-manage/deploy.md
+++ b/deploy-manage/deploy.md
@@ -2,19 +2,9 @@
 mapped_urls:
   - https://www.elastic.co/guide/en/serverless/current/intro.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro-deploy.html
+  - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/get-elastic.html
 ---
 
-% What needs to be done: Write from scratch
-
-% GitHub issue: https://github.com/elastic/docs-projects/issues/334
-
-% Scope notes: does plan for production content go here?  With orchestrator layer - explain relationship between orchestrator and clusters  how to help people to be aware of the other products that might need to be deployed? "these are the core products, you might add others on"  describe relationship between orchestrators and ES  Explain that when using orchestrators a lot of the reference configuration of the orchestrated applications is still applicable. The user needs to learn how to configure the applications when using an orchestrator, then afterwards, the documentation of the application will be valid and applicable to their use case. When a certain feature or configuration is not applicable in some deployment types, the document will specify it.
-
-% Use migrated content from existing pages that map to this page:
-
-% - [ ] ./raw-migrated-files/docs-content/serverless/intro.md
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/elasticsearch-intro-deploy.md
-
 # Deploy
 
 Whether you're planning to use Elastic's pre-built solutions or Serverless projects, build your own applications with {{es}}, or analyze your data using {{kib}} tools, you'll need to deploy Elastic first.
@@ -23,13 +13,20 @@ This page will help you understand your deployment options and choose the approa
 
 ## Core components
 
-Every Elastic deployment requires {{es}} as its core data store and search/analytics engine.
-Additionally, {{kib}} provides the user interface for all Elastic solutions and Serverless projects. It is required for most use cases, from data exploration to monitoring and security analysis.
+All deployments include **{{es}}**. {{es}} is the distributed search and analytics engine, scalable data store, and vector database at the heart of all Elastic solutions.
 
-Your choice of deployment type determines how you'll set up and manage these core components, plus any additional components you need.
+In most cases, you also need to deploy **{{kib}}**. {{kib}} provides the user interface for all Elastic solutions and Serverless projects. It’s a powerful tool for visualizing and analyzing your data, and for managing and monitoring the {{stack}}. Although {{kib}} is not required to use {{es}}, it's required for most use cases, and is included by default when you deploy using certain deployment methods.
 
-:::{tip}
-Learn more about the [{{stack}}](/get-started/the-stack.md) to understand the core and optional components of an Elastic deployment.
+Your choice of deployment type determines how you'll set up and manage these core components, as well as any additional components you need.
+
+:::{admonition} Other {{stack}} components
+This section focuses on deploying and managing {{es}} and {{kib}}, as well as supporting orchestration technologies. However, depending on your use case, you might need to deploy [other {{stack}} components](/get-started/the-stack.md). For example, you might need to add components to ingest logs or metrics.
+
+To learn how to deploy optional {{stack}} components, refer to the following sections:
+* [Fleet and Elastic Agent](asciidocalypse://docs/docs-content/docs/reference/ingestion-tools/fleet/index.md)
+* [APM](/solutions/observability/apps/application-performance-monitoring-apm.md)
+* [Beats](asciidocalypse://docs/beats/docs/reference/index.md)
+* [Logstash](asciidocalypse://docs/logstash/docs/reference/index.md)
 :::
 
 ## Choosing your deployment type
@@ -41,10 +38,12 @@ Learn more about the [{{stack}}](/get-started/the-stack.md) to understand the co
 
 #### Managed by Elastic
 
-If you want to focus on using Elastic products rather than managing infrastructure, choose:
+If you want to focus on using Elastic products rather than managing infrastructure, choose one of the following options:
 
-- **Serverless**: Zero operational overhead, automatic scaling and updates, latest features
-- **Cloud hosted**: Balance of control and managed operations, choice of resources and regions
+- **{{serverless-full}}**: Zero operational overhead, automatic scaling and updates, latest features
+- **{{ech}}**: Balance of control and managed operations, choice of resources and regions
+
+Both of these options use [{{ecloud}}](/deploy-manage/deploy/elastic-cloud.md) as the orchestration platform.
 
 #### Self-hosted options
 
@@ -52,11 +51,14 @@ If you need to run Elastic on your infrastructure, choose between a fully self-m
 
 - **Fully self-managed**: Complete control and responsibility for your Elastic deployment
 - **With orchestration**:
-  - **Elastic Cloud on Kubernetes (ECK)**: If you need Kubernetes-native orchestration
-  - **Elastic Cloud Enterprise (ECE)**: If you need a multi-tenant orchestration platform
+  - **{{eck}} (ECK)**: If you need Kubernetes-native orchestration
+  - **{{ece}} (ECE)**: If you need a multi-tenant orchestration platform
 
-:::::{note}
-:::{dropdown} About orchestration
+::::{tip}
+Documentation will specify when certain features or configurations are not applicable to specific deployment types.
+::::
+
+### About orchestration
 
 An orchestrator automates the deployment and management of multiple Elastic clusters, handling tasks like scaling, upgrades, and monitoring.
 
@@ -66,27 +68,21 @@ Consider orchestration if you:
 - Have a Kubernetes environment (ECK)
 - Need to build a multi-tenant platform (ECE)
 
-Orchestrators manage the lifecycle of your Elastic deployments but don't change how the core products work. When using ECK or ECE:
+Orchestrators manage the lifecycle of your Elastic deployments but don't change how the core products work. When using an orchestrated deployment:
 - You'll still use the same Elasticsearch and Kibana features and configurations
 - Most product documentation remains applicable
 - You can add other Elastic products as needed
 - The orchestrator handles operational tasks while you focus on using and configuring the products
 
-::::{tip}
-Documentation will specify when certain features or configurations are not applicable to specific deployment types.
-::::
-:::
-:::::
-
 ### Versioning and compatibility 
 
 In {{serverless-full}}, you automatically get access to the latest versions of Elastic features and you don't need to manage version compatibility.
 
-With other deployment types ({{ecloud}} Hosted, ECE, and ECK), you control which {{stack}} versions you deploy and when you upgrade. The ECE and ECK orchestrators themselves also receive regular version updates, independent of the {{stack}} versions they manage.
+With other deployment types (ECH, ECE, and ECK), you control which {{stack}} versions you deploy and when you upgrade. The ECE and ECK orchestrators themselves also receive regular version updates, independent of the {{stack}} versions they manage.
 
 Consider this when choosing your deployment type:
 
-- Choose Serverless if you want automatic access to the latest features and don't want to manage version compatibility
+- Choose {{serverless-full}} if you want automatic access to the latest features and don't want to manage version compatibility
 - Choose other deployment types if you need more control over version management
 
 :::{tip}
@@ -95,8 +91,8 @@ Learn more about [versioning and availability](/get-started/versioning-availabil
 
 ### Cost considerations
 
-- **Serverless**: Pay for what you use
-- **Cloud hosted**: Subscription-based with resource allocation
+- **{{serverless-full}}**: Pay for what you use
+- **{{ech}}**: Subscription-based with resource allocation
 - **Self-hosted options**: Infrastructure costs plus operational overhead mean a higher total cost of ownership (TCO)
 
 :::::{tip}
diff --git a/deploy-manage/deploy/deployment-comparison.md b/deploy-manage/deploy/deployment-comparison.md
index d7113f32e9..4c71a81591 100644
--- a/deploy-manage/deploy/deployment-comparison.md
+++ b/deploy-manage/deploy/deployment-comparison.md
@@ -1,5 +1,5 @@
 
-# Deployment comparison reference
+# Compare deployment options
 
 This reference provides detailed comparisons of features and capabilities across Elastic's deployment options: self-managed deployments, Elastic Cloud Hosted, and Serverless. For a high-level overview of deployment types and guidance on choosing between them, see the [overview](../deploy.md).
 
diff --git a/deploy-manage/deploy/kibana-reporting-configuration.md b/deploy-manage/deploy/kibana-reporting-configuration.md
index 25cb0281e5..c521cfee97 100644
--- a/deploy-manage/deploy/kibana-reporting-configuration.md
+++ b/deploy-manage/deploy/kibana-reporting-configuration.md
@@ -4,7 +4,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/kibana/current/reporting-production-considerations.html
 ---
 
-# Kibana reporting configuration
+# Configure reporting
 
 % What needs to be done: Refine
 
diff --git a/deploy-manage/index.md b/deploy-manage/index.md
index e4f0ce85a8..8b15874d75 100644
--- a/deploy-manage/index.md
+++ b/deploy-manage/index.md
@@ -1,11 +1,7 @@
 ---
 mapped_urls:
-  - https://www.elastic.co/guide/en/kibana/current/introduction.html
   - https://www.elastic.co/guide/en/kibana/current/setup.html
-  - https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its-solutions/current/get-elastic.html
-  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scalability.html
   - https://www.elastic.co/guide/en/cloud/current/ec-faq-technical.html
-  - https://www.elastic.co/guide/en/elastic-stack/current/overview.html
   - https://www.elastic.co/guide/en/elastic-stack/current/index.html
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-administering-deployments.html
   - https://www.elastic.co/guide/en/kibana/current/management.html
@@ -13,51 +9,61 @@ mapped_urls:
 
 # Deploy and manage
 
-% What needs to be done: Write from scratch
+To get started with Elastic, you need to choose a deployment method and deploy {{stack}} components. 
 
-% GitHub issue: https://github.com/elastic/docs-projects/issues/332
+In this section, you'll learn about how to deploy and manage all aspects of your Elastic environment. You'll learn how to design resilient, highly available clusters and deployments, and how to maintain and scale your environment to grow with your use case.
 
-% Scope notes: Explain that a basic deployment always has ES, usually has Kibana, might have xyz.
+This section focuses on deploying and managing the core components of the {{stack}}: {{es}} and {{kib}}. It also documents deploying and managing supporting orchestration technologies. However, depending on your use case, you might need to deploy other components. [Learn more](/get-started/the-stack.md).
 
-% Use migrated content from existing pages that map to this page:
+:::{tip}
+To get started quickly, you can set up a [local development and testing environment](/solutions/search/run-elasticsearch-locally.md), or sign up for a [Serverless](https://cloud.elastic.co/serverless-registration) or [Hosted](https://cloud.elastic.co/registration) trial in {{ecloud}}.
+:::
 
-% - [ ] ./raw-migrated-files/kibana/kibana/introduction.md
-% - [ ] ./raw-migrated-files/kibana/kibana/setup.md
-% - [ ] ./raw-migrated-files/tech-content/starting-with-the-elasticsearch-platform-and-its-solutions/get-elastic.md
-% - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/scalability.md
-% - [ ] ./raw-migrated-files/cloud/cloud/ec-faq-technical.md
-% - [ ] ./raw-migrated-files/stack-docs/elastic-stack/overview.md
-%      Notes: redirect only
-% - [ ] ./raw-migrated-files/cloud/cloud-enterprise/ece-administering-deployments.md
-%      Notes: redirect only
-% - [ ] ./raw-migrated-files/kibana/kibana/management.md
-%      Notes: redirect only
+## Design and deploy
 
-$$$adding_index_privileges$$$
+Learn how to design and deploy a production-ready Elastic environment.
 
-$$$faq-hw-architecture$$$
+* [](/deploy-manage/deploy.md): Understand your deployment options and choose the approach that best fits your needs. 
+  
+  If you already know how you want to deploy, you can jump to the documentation for your preferred deployment method: 
+  * [{{serverless-full}}](/deploy-manage/deploy/elastic-cloud/serverless.md)
+  * [{{ech}}](/deploy-manage/deploy/elastic-cloud/cloud-hosted.md)
+  * [{{ece}}](/deploy-manage/deploy/cloud-enterprise.md)
+  * [{{eck}}](/deploy-manage/deploy/cloud-on-k8s.md)
+  * [Self-managed](/deploy-manage/deploy/self-managed.md)
 
-$$$faq-master-nodes$$$
+* [](/deploy-manage/distributed-architecture.md): Learn about the architecture of {{es}} and {{kib}}, and how Elastic stores and retrieves data and executes tasks in clusters with multiple nodes.
+* [](/deploy-manage/production-guidance.md): Review tips and guidance that you can use to design a production environment that matches your workloads, policies, and deployment needs.
+* [](/deploy-manage/reference-architectures.md): Explore blueprints for deploying clusters tailored to different use cases.
+* [](/deploy-manage/tools.md): Learn about the tools available to safeguard data, ensure continuous availability, and maintain resilience in your {{es}} environment.
+* [](/deploy-manage/autoscaling.md): Learn how to configure your [orchestrated](/deploy-manage/deploy.md#about-orchestration) deployment to scale based on policies and cluster signals. Applies to {{ech}}, {{ece}}, and {{eck}} deployments.
 
-$$$faq-ssl$$$
+:::{admonition} Serverless does it for you
+If you deploy an {{serverless-full}} project, then you don't need to learn about Elastic architecture, production design, resilience, or scaling concepts. Serverless automatically scales and backs up your cluster for you, and is ready for production out of the box.
+:::
 
-$$$faq-autoscale$$$
+## Secure and control access
 
-$$$faq-ip-sniffing$$$
+Learn how to secure your Elastic environment to restrict access to only authorized parties, and allow communication between your environment and external parties.
 
-$$$faq-encryption-at-rest$$$
+* [](/deploy-manage/security.md): Learn about security features that prevent bad actors from tampering with your data, and encrypt communications to, from, and within your cluster.
+* [](/deploy-manage/users-roles.md): Manage user authentication and authorization at the level of your Cloud organization, your orchestrator, or your deployment or cluster.
+* [](/deploy-manage/manage-spaces.md): Learn how to organize content in {{kib}}, and restrict access to this content to specific users.
+* [](/deploy-manage/api-keys.md): Authenticate and authorize programmatic access to your deployments and {{es}} resources.
+* [](/deploy-manage/manage-connectors.md): Manage connection information between Elastic and third-party systems.
+* [](/deploy-manage/remote-clusters.md): Enable communication between {{es}} clusters to support [cross-cluster replication](/deploy-manage/tools/cross-cluster-replication.md) and [cross-cluster search](/solutions/search/cross-cluster-search.md).
 
-$$$faq-static-ip-elastic-cloud$$$
+## Administer and maintain
 
-**This page is a work in progress.** The documentation team is working to combine content pulled from the following pages:
+Monitor the performance of your Elastic environment, administer your organization and license, and maintain the health of your environment.
 
-% Doesn't exist
-% * [/raw-migrated-files/kibana/kibana/introduction.md](/raw-migrated-files/kibana/kibana/introduction.md)
+* [](/deploy-manage/monitor.md): View health and performance data for Elastic components, and receive recommendations and insights.
+* [](/deploy-manage/cloud-organization.md): Administer your {{ecloud}} organization, including billing, organizational contacts, and service monitoring.
+* [](/deploy-manage/license.md): Learn how to manage your Elastic license or subscription.
+* [](/deploy-manage/maintenance.md): Learn how to isolate or deactivate parts of your Elastic environment to perform maintenance, or restart parts of Elastic.
+* [](/deploy-manage/uninstall.md): Uninstall one or more Elastic components.
+
+## Upgrade
+
+You can [upgrade your Elastic environment](/deploy-manage/upgrade.md) to gain access to the latest features. Learn how to upgrade your cluster or deployment to the latest {{stack}} version, or upgrade your {{ece}} orchestrator or {{eck}} operator to the latest version.
 
-* [/raw-migrated-files/kibana/kibana/setup.md](/raw-migrated-files/kibana/kibana/setup.md)
-* [/raw-migrated-files/tech-content/starting-with-the-elasticsearch-platform-and-its-solutions/get-elastic.md](/raw-migrated-files/tech-content/starting-with-the-elasticsearch-platform-and-its-solutions/get-elastic.md)
-* [/raw-migrated-files/elasticsearch/elasticsearch-reference/scalability.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/scalability.md)
-* [/raw-migrated-files/cloud/cloud/ec-faq-technical.md](/raw-migrated-files/cloud/cloud/ec-faq-technical.md)
-* [/raw-migrated-files/stack-docs/elastic-stack/overview.md](/raw-migrated-files/stack-docs/elastic-stack/overview.md)
-* [/raw-migrated-files/cloud/cloud-enterprise/ece-administering-deployments.md](/raw-migrated-files/cloud/cloud-enterprise/ece-administering-deployments.md)
-* [/raw-migrated-files/kibana/kibana/management.md](/raw-migrated-files/kibana/kibana/management.md)
\ No newline at end of file
diff --git a/deploy-manage/license.md b/deploy-manage/license.md
index 5a31b963ba..ec1bf6c663 100644
--- a/deploy-manage/license.md
+++ b/deploy-manage/license.md
@@ -8,9 +8,9 @@ applies_to:
   serverless:
 ---
 
-# Manage your license  
+# Licenses and subscriptions  
 
-Your Elastic license determines which features are available and what level of support you receive. 
+Your Elastic license or subscription determines which features are available and what level of support you receive. 
 
 Depending on your deployment type, licenses and subscriptions are applied at different levels:
 
diff --git a/deploy-manage/manage-connectors.md b/deploy-manage/manage-connectors.md
index bd8efe9a0c..e836248893 100644
--- a/deploy-manage/manage-connectors.md
+++ b/deploy-manage/manage-connectors.md
@@ -7,7 +7,7 @@ applies_to:
   serverless:
 ---
 
-# Manage connectors [connector-management]
+# Connectors [connector-management]
 
 Connectors serve as a central place to store connection information for both Elastic and third-party systems. They enable the linking of actions to rules, which execute as background tasks on the {{kib}} server when rule conditions are met. This allows rules to route actions to various destinations such as log files, ticketing systems, and messaging tools. Different {{kib}} apps may have their own rule types, but they typically share connectors. The **{{stack-manage-app}} > {{connectors-ui}}** provides a central location to view and manage all connectors in the current space.
 
diff --git a/deploy-manage/manage-spaces.md b/deploy-manage/manage-spaces.md
index a4a826b560..14cc3e2c8b 100644
--- a/deploy-manage/manage-spaces.md
+++ b/deploy-manage/manage-spaces.md
@@ -7,26 +7,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/serverless/current/spaces.html
 ---
 
-# Manage spaces [xpack-spaces]
-
-% What needs to be done: Refine
-
-% GitHub issue: https://github.com/elastic/docs-projects/issues/348
-
-% Scope notes: Create a new landing page including the content that is relevant for both serverless and stateful Highlight the differences in subheadings for serverless and stateful Link to solution topics on spaces
-
-% Use migrated content from existing pages that map to this page:
-
-% - [ ] ./raw-migrated-files/kibana/kibana/xpack-spaces.md
-% - [ ] ./raw-migrated-files/docs-content/serverless/spaces.md
-
-% Internal links rely on the following IDs being on this page (e.g. as a heading ID, paragraph ID, etc):
-
-$$$spaces-control-feature-visibility$$$
-
-$$$spaces-control-user-access$$$
-
-$$$spaces-managing$$$
+# Spaces [xpack-spaces]
 
 **Spaces** let you organize your content and users according to your needs.
 
@@ -55,14 +36,14 @@ To go to **Spaces**, find **Stack Management** in the navigation menu or use the
 The maximum number of spaces that you can have differs by deployment type:
 
 * **Serverless projects:** Maximum of 100 spaces.
-* **{{stack}} deployments:** Controlled by the `xpack.spaces.maxSpaces` setting. Default is 1000. View the full list of Space settings in [this document](kibana://reference/configuration-reference/spaces-settings.md).
+* **{{stack}} deployments:** Controlled by the `xpack.spaces.maxSpaces` setting. Default is 1000. View the [full list of Space settings](kibana://reference/configuration-reference/spaces-settings.md).
 
 To create a space:
 
-::::{tab-set}
+:::::{tab-set}
 :group: stack-serverless
 
-:::{tab-item} {{serverless-short}}
+::::{tab-item} {{serverless-short}}
 :sync: serverless
 
 1. Click **Create space** or select the space you want to edit.
@@ -73,9 +54,9 @@ To create a space:
 
 3. Customize the avatar of the space to your liking.
 4. Save the space.
-:::
+::::
 
-:::{tab-item} {{stack}}
+::::{tab-item} {{stack}}
 :sync: stack
 
 1. Select **Create space** and provide a name, description, and URL identifier.
@@ -89,15 +70,16 @@ To create a space:
 
 3. If you selected the **Classic** solution view, you can customize the **Feature visibility** as you need it to be for that space.
 
-   % This is hacking since proper admonition blocks are currently breaking my tabs
-   > **Note:** Even when disabled in this menu, some Management features can remain visible to some users depending on their privileges. Additionally, controlling feature visibility is not a security feature. To secure access to specific features on a per-user basis, you must configure [{{kib}} Security](/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md).
+   :::{note}
+   Even when disabled in this menu, some Management features can remain visible to some users depending on their privileges. Additionally, controlling feature visibility is not a security feature. To secure access to specific features on a per-user basis, you must configure [{{kib}} Security](/deploy-manage/users-roles/cluster-or-deployment-auth/built-in-roles.md).
+   :::
 
 4. Customize the avatar of the space to your liking.
 5. Save your new space by selecting **Create space**.
-:::
-
 ::::
 
+:::::
+
 You can edit all of the space settings you just defined at any time, except for the URL identifier.
 
 Elastic also allows you to manage spaces using APIs:
diff --git a/deploy-manage/production-guidance.md b/deploy-manage/production-guidance.md
index 322e3f7d97..c2b005180b 100644
--- a/deploy-manage/production-guidance.md
+++ b/deploy-manage/production-guidance.md
@@ -1,6 +1,7 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud/current/ec-best-practices-data.html
+  - https://www.elastic.co/guide/en/elasticsearch/reference/current/scalability.html
 ---
 
 # Production guidance [ec-best-practices-data]
diff --git a/deploy-manage/security.md b/deploy-manage/security.md
index 589190a663..b085b550c1 100644
--- a/deploy-manage/security.md
+++ b/deploy-manage/security.md
@@ -9,10 +9,21 @@ mapped_urls:
   - https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/security-limitations.html
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/es-security-principles.html
+  - https://www.elastic.co/guide/en/cloud/current/ec-faq-technical.html
 ---
 
 # Security
 
+% SR: include this info somewhere in this section
+% {{ech}} doesn't support custom SSL certificates, which means that a custom CNAME for an {{ech}} endpoint such as *mycluster.mycompanyname.com* also is not supported.
+%
+% In {{ech}}, IP sniffing is not supported by design and will not return the expected results. We prevent IP sniffing from returning the expected results to improve the security of our underlying {{ech}} infrastructure.
+%
+% encryption at rest (EAR) is enabled in {{ech}} by default. We support EAR for both the data stored in your clusters and the snapshots we take for backup, on all cloud platforms and across all regions.
+% You can also bring your own key (BYOK) to encrypt your Elastic Cloud deployment data and snapshots. For more information, check [Encrypt your deployment with a customer-managed encryption key](../../../deploy-manage/security/encrypt-deployment-with-customer-managed-encryption-key.md).
+
+Note that the encryption happens at the file system level.
+
 % What needs to be done: Refine
 
 % GitHub issue: https://github.com/elastic/docs-projects/issues/346
@@ -31,6 +42,7 @@ mapped_urls:
 % - [ ] ./raw-migrated-files/kibana/kibana/using-kibana-with-security.md
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/security-limitations.md
 % - [ ] ./raw-migrated-files/elasticsearch/elasticsearch-reference/es-security-principles.md
+% - [ ] ./raw-migrated-files/cloud/cloud/ec-faq-technical.md
 
 $$$field-document-limitations$$$
 
@@ -52,4 +64,5 @@ $$$maintaining-audit-trail$$$
 * [/raw-migrated-files/cloud/cloud-heroku/ech-security.md](/raw-migrated-files/cloud/cloud-heroku/ech-security.md)
 * [/raw-migrated-files/kibana/kibana/using-kibana-with-security.md](/raw-migrated-files/kibana/kibana/using-kibana-with-security.md)
 * [/raw-migrated-files/elasticsearch/elasticsearch-reference/security-limitations.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/security-limitations.md)
-* [/raw-migrated-files/elasticsearch/elasticsearch-reference/es-security-principles.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/es-security-principles.md)
\ No newline at end of file
+* [/raw-migrated-files/elasticsearch/elasticsearch-reference/es-security-principles.md](/raw-migrated-files/elasticsearch/elasticsearch-reference/es-security-principles.md)
+* [/raw-migrated-files/cloud/cloud/ec-faq-technical.md](/raw-migrated-files/cloud/cloud/ec-faq-technical.md)
\ No newline at end of file
diff --git a/deploy-manage/toc.yml b/deploy-manage/toc.yml
index 28b1c78f55..f8cb841b54 100644
--- a/deploy-manage/toc.yml
+++ b/deploy-manage/toc.yml
@@ -1,27 +1,6 @@
 project: 'Deploy and manage'
 toc:
   - file: index.md
-  - file: distributed-architecture.md
-    children:
-      - file: distributed-architecture/clusters-nodes-shards.md
-        children:
-          - file: distributed-architecture/clusters-nodes-shards/node-roles.md
-      - file: distributed-architecture/reading-and-writing-documents.md
-      - file: distributed-architecture/shard-allocation-relocation-recovery.md
-        children:
-          - file: distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
-          - file: distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
-            children:
-              - file: distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
-      - file: distributed-architecture/discovery-cluster-formation.md
-        children:
-          - file: distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
-          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
-          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
-          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
-          - file: distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
-          - file: distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
-      - file: distributed-architecture/kibana-tasks-management.md
   - file: deploy.md
     children:
       - file: deploy/deployment-comparison.md
@@ -364,6 +343,27 @@ toc:
           - file: deploy/self-managed/air-gapped-install.md
           - file: deploy/self-managed/tools-apis.md
       - file: deploy/kibana-reporting-configuration.md
+  - file: distributed-architecture.md
+    children:
+      - file: distributed-architecture/clusters-nodes-shards.md
+        children:
+          - file: distributed-architecture/clusters-nodes-shards/node-roles.md
+      - file: distributed-architecture/reading-and-writing-documents.md
+      - file: distributed-architecture/shard-allocation-relocation-recovery.md
+        children:
+          - file: distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md
+          - file: distributed-architecture/shard-allocation-relocation-recovery/index-level-shard-allocation.md
+            children:
+              - file: distributed-architecture/shard-allocation-relocation-recovery/delaying-allocation-when-node-leaves.md
+      - file: distributed-architecture/discovery-cluster-formation.md
+        children:
+          - file: distributed-architecture/discovery-cluster-formation/discovery-hosts-providers.md
+          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-quorums.md
+          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-voting.md
+          - file: distributed-architecture/discovery-cluster-formation/modules-discovery-bootstrap-cluster.md
+          - file: distributed-architecture/discovery-cluster-formation/cluster-state-overview.md
+          - file: distributed-architecture/discovery-cluster-formation/cluster-fault-detection.md
+      - file: distributed-architecture/kibana-tasks-management.md
   - file: production-guidance.md
     children:
       - file: production-guidance/getting-ready-for-production-elasticsearch.md
@@ -473,33 +473,6 @@ toc:
       - file: autoscaling/autoscaling-in-eck.md
       - file: autoscaling/autoscaling-deciders.md
       - file: autoscaling/trained-model-autoscaling.md
-  - file: remote-clusters.md
-    children:
-      - file: remote-clusters/ec-enable-ccs.md
-        children:
-          - file: remote-clusters/ec-remote-cluster-same-ess.md
-          - file: remote-clusters/ec-remote-cluster-other-ess.md
-          - file: remote-clusters/ec-remote-cluster-ece.md
-          - file: remote-clusters/ec-remote-cluster-self-managed.md
-          - file: remote-clusters/ec-enable-ccs-for-eck.md
-          - file: remote-clusters/ec-edit-remove-trusted-environment.md
-          - file: remote-clusters/ec-migrate-ccs.md
-      - file: remote-clusters/ece-enable-ccs.md
-        children:
-          - file: remote-clusters/ece-remote-cluster-same-ece.md
-          - file: remote-clusters/ece-remote-cluster-other-ece.md
-          - file: remote-clusters/ece-remote-cluster-ece-ess.md
-          - file: remote-clusters/ece-remote-cluster-self-managed.md
-          - file: remote-clusters/ece-enable-ccs-for-eck.md
-          - file: remote-clusters/ece-edit-remove-trusted-environment.md
-          - file: remote-clusters/ece-migrate-ccs.md
-      - file: remote-clusters/remote-clusters-self-managed.md
-        children:
-          - file: remote-clusters/remote-clusters-api-key.md
-          - file: remote-clusters/remote-clusters-cert.md
-          - file: remote-clusters/remote-clusters-migrate.md
-          - file: remote-clusters/remote-clusters-settings.md
-      - file: remote-clusters/eck-remote-clusters.md
   - file: security.md
     children:
       - file: security/secure-your-elastic-cloud-enterprise-installation.md
@@ -644,6 +617,33 @@ toc:
       - file: api-keys/elastic-cloud-api-keys.md
       - file: api-keys/elastic-cloud-enterprise-api-keys.md
   - file: manage-connectors.md
+  - file: remote-clusters.md
+    children:
+      - file: remote-clusters/ec-enable-ccs.md
+        children:
+          - file: remote-clusters/ec-remote-cluster-same-ess.md
+          - file: remote-clusters/ec-remote-cluster-other-ess.md
+          - file: remote-clusters/ec-remote-cluster-ece.md
+          - file: remote-clusters/ec-remote-cluster-self-managed.md
+          - file: remote-clusters/ec-enable-ccs-for-eck.md
+          - file: remote-clusters/ec-edit-remove-trusted-environment.md
+          - file: remote-clusters/ec-migrate-ccs.md
+      - file: remote-clusters/ece-enable-ccs.md
+        children:
+          - file: remote-clusters/ece-remote-cluster-same-ece.md
+          - file: remote-clusters/ece-remote-cluster-other-ece.md
+          - file: remote-clusters/ece-remote-cluster-ece-ess.md
+          - file: remote-clusters/ece-remote-cluster-self-managed.md
+          - file: remote-clusters/ece-enable-ccs-for-eck.md
+          - file: remote-clusters/ece-edit-remove-trusted-environment.md
+          - file: remote-clusters/ece-migrate-ccs.md
+      - file: remote-clusters/remote-clusters-self-managed.md
+        children:
+          - file: remote-clusters/remote-clusters-api-key.md
+          - file: remote-clusters/remote-clusters-cert.md
+          - file: remote-clusters/remote-clusters-migrate.md
+          - file: remote-clusters/remote-clusters-settings.md
+      - file: remote-clusters/eck-remote-clusters.md
   - file: monitor.md
     children:
       - file: monitor/autoops.md
diff --git a/deploy-manage/users-roles.md b/deploy-manage/users-roles.md
index fb6bb93c33..8059b7bd7e 100644
--- a/deploy-manage/users-roles.md
+++ b/deploy-manage/users-roles.md
@@ -11,7 +11,7 @@ applies_to:
   serverless: all
 ---
 
-# Manage users and roles
+# Users and roles
 
 To prevent unauthorized access to your Elastic resources, you need a way to identify users and validate that a user is who they claim to be (*authentication*), and control what data users can access and what tasks they can perform (*authorization*).
 
diff --git a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
index 411ea7a22d..3a35420be5 100644
--- a/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
+++ b/deploy-manage/users-roles/cluster-or-deployment-auth/kibana-role-management.md
@@ -85,7 +85,7 @@ Document-level and field-level security affords you even more granularity when i
 
 If you have at least a platinum license, you can manage access to indices in remote clusters.
 
-You can assign the same privileges, document-level, and field-level as for [local index privileges](/deploy-manage/index.md#adding_index_privileges).
+You can assign the same privileges, document-level, and field-level as for [local index privileges](#adding_index_privileges).
 
 ### Example: Grant access to indices in remote clusters [remote_index_privilege_example_1]
 
diff --git a/explore-analyze/index.md b/explore-analyze/index.md
index e594b28496..54676f7898 100644
--- a/explore-analyze/index.md
+++ b/explore-analyze/index.md
@@ -7,6 +7,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/kibana/current/introduction.html#visualize-and-analyze
   - https://www.elastic.co/guide/en/kibana/current/get-started.html
   - https://www.elastic.co/guide/en/kibana/current/accessibility.html
+  - https://www.elastic.co/guide/en/kibana/current/introduction.html
 ---
 
 # Explore and analyze
diff --git a/explore-analyze/machine-learning/setting-up-machine-learning.md b/explore-analyze/machine-learning/setting-up-machine-learning.md
index 62819a592b..8a9225dc4f 100644
--- a/explore-analyze/machine-learning/setting-up-machine-learning.md
+++ b/explore-analyze/machine-learning/setting-up-machine-learning.md
@@ -66,7 +66,7 @@ Granting `All` or `Read` {{kib}} feature privilege for {{ml-app}} will also gran
 
 #### Feature visibility in Spaces [kib-visibility-spaces]
 
-In {{kib}}, the {{ml-features}} must be visible in your [space](../../deploy-manage/manage-spaces.md#spaces-control-feature-visibility). To manage which features are visible in your space, go to **{{stack-manage-app}}** > **{{kib}}** > **Spaces** or use the [global search field](../find-and-organize/find-apps-and-objects.md) to locate **Spaces** directly.
+In {{kib}}, the {{ml-features}} must be visible in your [space](../../deploy-manage/manage-spaces.md). To manage which features are visible in your space, go to **{{stack-manage-app}}** > **{{kib}}** > **Spaces** or use the [global search field](../find-and-organize/find-apps-and-objects.md) to locate **Spaces** directly.
 
 :::{image} ../../images/machine-learning-spaces.jpg
 :alt: Manage spaces in {{kib}}
diff --git a/get-started/the-stack.md b/get-started/the-stack.md
index 9116a666e3..e9445a02e3 100644
--- a/get-started/the-stack.md
+++ b/get-started/the-stack.md
@@ -4,6 +4,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/kibana/current/introduction.html
   - https://www.elastic.co/guide/en/kibana/current/index.html
   - https://www.elastic.co/guide/en/elastic-stack/current/installing-elastic-stack.html
+  - https://www.elastic.co/guide/en/elastic-stack/current/overview.html
 ---
 
 # The {{stack}}
@@ -16,7 +17,13 @@ $$$kibana-navigation-search$$$
 
 What is the {{stack}}? It’s a fast and highly scalable set of components — {{es}}, {{kib}}, {{beats}}, {{ls}}, and others — that together enable you to securely take data from any source, in any format, and then search, analyze, and visualize it.
 
-You have many options for [deploying the {{stack}}](./deployment-options.md) to suit your needs. You can deploy it on your own hardware, in the cloud, or use a managed service on {{ecloud}}.
+The products in the {{es}} are designed to be used together and releases are synchronized to simplify the installation and upgrade process.
+
+You have many options for deploying the {{stack}} to suit your needs. You can deploy it on your own hardware, in the cloud, or use a managed service on {{ecloud}}.
+
+:::{tip}
+To learn how to deploy {{es}}, {{kib}}, and supporting orchestration technologies, refer to [](/deploy-manage/index.md). To learn how to deploy additional ingest and consume components, refer to the documentation for the component.
+:::
 
 ![Components of the Elastic Stack](../images/stack-components-diagram.svg)
 
diff --git a/raw-migrated-files/cloud/cloud/ec-faq-technical.md b/raw-migrated-files/cloud/cloud/ec-faq-technical.md
index 6685499dc4..501b1f8b18 100644
--- a/raw-migrated-files/cloud/cloud/ec-faq-technical.md
+++ b/raw-migrated-files/cloud/cloud/ec-faq-technical.md
@@ -2,14 +2,6 @@
 
 This frequently-asked-questions list answers some of your more common questions about configuring {{ech}}.
 
-* [Can I implement a Hot-Warm architecture?](../../../deploy-manage/index.md#faq-hw-architecture)
-* [What about dedicated master nodes?](../../../deploy-manage/index.md#faq-master-nodes)
-* [Can I use a Custom SSL certificate?](../../../deploy-manage/index.md#faq-ssl)
-* [Can {{ech}} autoscale?](../../../deploy-manage/index.md#faq-autoscale)
-* [Do you support IP sniffing?](../../../deploy-manage/index.md#faq-ip-sniffing)
-* [Does {{ech}} support encryption at rest?](../../../deploy-manage/index.md#faq-encryption-at-rest)
-* [Can I find the static IP addresses for my endpoints on {{ech}}?](../../../deploy-manage/index.md#faq-static-ip-elastic-cloud)
-
     $$$faq-hw-architecture$$$Can I implement a hot-warm architecture?
     :   [*hot-warm architecture*](https://www.elastic.co/blog/hot-warm-architecture) refers to an Elasticsearch setup for larger time-data analytics use cases with two different types of nodes, hot and warm. {{ech}} supports hot-warm architectures in all of the solutions provided by allowing you to add warm nodes to any of your deployments.
 
diff --git a/raw-migrated-files/kibana/kibana/management.md b/raw-migrated-files/kibana/kibana/management.md
deleted file mode 100644
index c4d72e9423..0000000000
--- a/raw-migrated-files/kibana/kibana/management.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Stack Management [management]
-
-**Stack Management** is home to UIs for managing all things Elastic Stack— indices, clusters, licenses, UI settings, data views, spaces, and more.
-
-Access to individual features is governed by {{es}} and {{kib}} privileges. Consult your administrator if you do not have the appropriate access.
-
-
-## Ingest [manage-ingest]
-
-|     |     |
-| --- | --- |
-| [Ingest Pipelines](../../../manage-data/ingest/transform-enrich/ingest-pipelines.md) | Create and manage ingest pipelines that let you perform common transformationsand enrichments on your data. |
-| [Logstash Pipelines](logstash://reference/logstash-centralized-pipeline-management.md) | Create, edit, and delete your Logstash pipeline configurations. |
-
-
-## Data [manage-data]
-
-|     |     |
-| --- | --- |
-| [Index Management](../../../manage-data/lifecycle/index-lifecycle-management/index-management-in-kibana.md) | View index settings, mappings, and statistics and perform operations, such as refreshing,flushing, and clearing the cache. Practicing good index management ensuresthat your data is stored cost effectively. |
-| [Index Lifecycle Policies](../../../manage-data/lifecycle/index-lifecycle-management.md) | Create a policy for defining the lifecycle of an index as it agesthrough the hot, warm, cold, and delete phases.Such policies help you control operation costsbecause you can put data in different resource tiers. |
-| [Snapshot and Restore](../../../deploy-manage/tools/snapshot-and-restore.md) | Define a policy that creates, schedules, and automatically deletes snapshots to ensure that youhave backups of your cluster in case something goes wrong. |
-| [Rollup Jobs](../../../manage-data/lifecycle/rollup.md) | [8.11.0] Create a job that periodically aggregates data from one or more indices, and thenrolls it into a new, compact index. Rollup indices are a good way to store months oryears of historical data in combination with your raw data. |
-| [Transforms](../../../explore-analyze/transforms.md) | Use transforms to pivot existing {{es}} indices into summarized or entity-centric indices. |
-| [Cross-Cluster Replication](/deploy-manage/tools/cross-cluster-replication/set-up-cross-cluster-replication.md) | Replicate indices on a remote cluster and copy them to a follower index on a local cluster.This is important fordisaster recovery. It also keeps data local for faster queries. |
-| [Remote Clusters](/deploy-manage/remote-clusters/remote-clusters-self-managed.md) | Manage your remote clusters for use with cross-cluster search and cross-cluster replication.You can add and remove remote clusters, and check their connectivity. |
-
-
-## Alerts and Insights [manage-alerts-insights]
-
-|     |     |
-| --- | --- |
-| [{{rules-ui}}](../../../explore-analyze/alerts-cases.md) | Centrally [manage your rules](../../../explore-analyze/alerts-cases/alerts/create-manage-rules.md) across {{kib}}. |
-| [Cases](../../../explore-analyze/alerts-cases/cases.md) | Create and manage cases to investigate issues. |
-| [{{connectors-ui}}](../../../deploy-manage/manage-connectors.md) | Create and [manage reusable connectors](../../../deploy-manage/manage-connectors.md) for triggering actions. |
-| [Reporting](../../../explore-analyze/report-and-share.md) | Monitor the generation of reports—PDF, PNG, and CSV—and download reports that you previously generated.A report can contain a dashboard, visualization, table with Discover search results, or Canvas workpad. |
-| Machine Learning Jobs | View, export, and import your [{{anomaly-detect}}](../../../explore-analyze/machine-learning/anomaly-detection.md) and[{{dfanalytics}}](../../../explore-analyze/machine-learning/data-frame-analytics.md) jobs. Open the Single MetricViewer or Anomaly Explorer to see your {{anomaly-detect}} results. |
-| [Watcher](../../../explore-analyze/alerts-cases/watcher.md) | Detect changes in your data by creating, managing, and monitoring alerts.For example, you might create an alert when the maximum total CPU usage on a machine goesabove a certain percentage. |
-| [Maintenance windows](../../../explore-analyze/alerts-cases/alerts/maintenance-windows.md) | Suppress rule notifications for scheduled periods of time. |
-
-
-## Security [manage-security]
-
-|     |     |
-| --- | --- |
-| [Users](../../../deploy-manage/security.md) | View the users that have been defined on your cluster.Add or delete users and assign roles that give usersspecific privileges. |
-| [Roles](../../../deploy-manage/users-roles/cluster-or-deployment-auth/defining-roles.md) | View the roles that exist on your cluster. Customizethe actions that a user with the role can perform, on a cluster, index, and space level. |
-| [API Keys](../../../deploy-manage/api-keys/elasticsearch-api-keys.md) | Create secondary credentials so that you can send requests on behalf of the user.Secondary credentials have the same or lower access rights. |
-| [Role Mappings](../../../deploy-manage/users-roles/cluster-or-deployment-auth/mapping-users-groups-to-roles.md) | Assign roles to your users using a set of rules. Role mappings are requiredwhen authenticating via an external identity provider, such as Active Directory,Kerberos, PKI, OIDC, and SAML. |
-
-
-## {{kib}} [manage-kibana]
-
-|     |     |
-| --- | --- |
-| [Data Views](../../../explore-analyze/find-and-organize/data-views.md) | Manage the fields in the data views that retrieve your data from {{es}}. |
-| [Saved Objects](/explore-analyze/find-and-organize/saved-objects.md) | Copy, edit, delete, import, and export your saved objects.These include dashboards, visualizations, maps, data views, Canvas workpads, and more. |
-| [Tags](../../../explore-analyze/find-and-organize/tags.md) | Create, manage, and assign tags to your saved objects. |
-| [Search Sessions](../../../explore-analyze/discover/search-sessions.md) | Manage your saved search sessions, groups of queries that run in the background.Search sessions are useful when your queries take longer than usual to process,for example, when you have a large volume of data or when the performance of your storage location is slow. |
-| [Spaces](../../../deploy-manage/manage-spaces.md) | Create spaces to organize your dashboards and other saved objects into categories.A space is isolated from all other spaces,so you can tailor it to your needs without impacting others. |
-| [Advanced Settings](kibana://reference/advanced-settings.md) | Customize {{kib}} to suit your needs. Change the format for displaying dates, turn on dark mode,set the timespan for notification messages, and much more. |
-
-
-## Stack [manage-stack]
-
-|     |     |
-| --- | --- |
-| [License Management](../../../deploy-manage/license/manage-your-license-in-self-managed-cluster.md) | View the status of your license, start a trial, or install a new license. Forthe full list of features that are included in your license,see the [subscription page](https://www.elastic.co/subscriptions). |
-
diff --git a/raw-migrated-files/toc.yml b/raw-migrated-files/toc.yml
index 9d8c39c9d6..383d1c2ee1 100644
--- a/raw-migrated-files/toc.yml
+++ b/raw-migrated-files/toc.yml
@@ -264,7 +264,6 @@ toc:
       - file: kibana/kibana/esql.md
       - file: kibana/kibana/install.md
       - file: kibana/kibana/logging-settings.md
-      - file: kibana/kibana/management.md
       - file: kibana/kibana/reporting-production-considerations.md
       - file: kibana/kibana/search-ai-assistant.md
       - file: kibana/kibana/secure-reporting.md
diff --git a/redirects.yml b/redirects.yml
index 3f902ad7cd..9f65b82505 100644
--- a/redirects.yml
+++ b/redirects.yml
@@ -14,6 +14,9 @@ redirects:
       'anonymous-authentication':
       'basic-authentication':
       'http-authentication':
+  'deploy-manage/manage-spaces.md':
+    anchors:
+      'spaces-control-feature-visibility':
   'deploy-manage/deploy/cloud-enterprise/deploy-large-installation-cloud.md': '!deploy-manage/deploy/cloud-enterprise/deploy-large-installation.md'
 
 ## explore-analyze
diff --git a/reference/glossary/index.md b/reference/glossary/index.md
index 1fbd12c4c9..678adc7888 100644
--- a/reference/glossary/index.md
+++ b/reference/glossary/index.md
@@ -286,7 +286,7 @@ $$$glossary-external-alert$$$ external alert
 ## F [f-glos]
 
 $$$glossary-feature-controls$$$ Feature Controls
-:   Enables administrators to customize which features are available in each [space](/reference/glossary/index.md#glossary-space). See [Feature Controls](/deploy-manage/manage-spaces.md#spaces-control-feature-visibility).
+:   Enables administrators to customize which features are available in each [space](/reference/glossary/index.md#glossary-space). See [](/deploy-manage/manage-spaces.md).
 
 $$$glossary-feature-importance$$$ feature importance
 :   In supervised {{ml}} methods such as {{regression}} and {{classification}}, feature importance indicates the degree to which a specific feature affects a prediction. See [{{regression-cap}} feature importance](/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-regression.md#dfa-regression-feature-importance) and [{{classification-cap}} feature importance](/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-classification.md#dfa-classification-feature-importance).
@@ -302,7 +302,7 @@ $$$glossary-field-reference$$$ field reference
 
 $$$glossary-field$$$ field
 :   1. Key-value pair in a [document](/reference/glossary/index.md#glossary-document). See [Mapping](/manage-data/data-store/mapping.md).
-2. In {{ls}}, this term refers to an [event](/reference/glossary/index.md#glossary-event) property. For example, each event in an apache access log has properties, such as a status code (200, 404), request path ("/", "index.html"), HTTP verb (GET, POST), client IP address, and so on. {{ls}} uses the term "fields" to refer to these properties.
+1. In {{ls}}, this term refers to an [event](/reference/glossary/index.md#glossary-event) property. For example, each event in an apache access log has properties, such as a status code (200, 404), request path ("/", "index.html"), HTTP verb (GET, POST), client IP address, and so on. {{ls}} uses the term "fields" to refer to these properties.
 
 
 $$$glossary-filter-plugin$$$ filter plugin
diff --git a/solutions/security/detect-and-alert/detections-requirements.md b/solutions/security/detect-and-alert/detections-requirements.md
index 95165600fd..4f7d223b23 100644
--- a/solutions/security/detect-and-alert/detections-requirements.md
+++ b/solutions/security/detect-and-alert/detections-requirements.md
@@ -50,7 +50,7 @@ After changing the `xpack.encryptedSavedObjects.encryptionKey` value and restart
 
 ## Enable and access detections [enable-detections-ui]
 
-To use the Detections feature, it must be enabled, your role must have access to rules and alerts, and your {{kib}} space must have **Data View Management** [feature visibility](/deploy-manage/manage-spaces.md#spaces-control-feature-visibility). If your role doesn’t have the cluster and index privileges needed to enable this feature, you can request someone who has these privileges to visit your {{kib}} space, which will turn it on for you.
+To use the Detections feature, it must be enabled, your role must have access to rules and alerts, and your {{kib}} space must have **Data View Management** [feature visibility](/deploy-manage/manage-spaces.md). If your role doesn’t have the cluster and index privileges needed to enable this feature, you can request someone who has these privileges to visit your {{kib}} space, which will turn it on for you.
 
 ::::{note}
 For instructions about using {{ml}} jobs and rules, refer to [Machine learning job and rule requirements](/solutions/security/advanced-entity-analytics/machine-learning-job-rule-requirements.md).
diff --git a/solutions/security/get-started/data-views-elastic-security.md b/solutions/security/get-started/data-views-elastic-security.md
index bbe4022752..092e3a5411 100644
--- a/solutions/security/get-started/data-views-elastic-security.md
+++ b/solutions/security/get-started/data-views-elastic-security.md
@@ -50,7 +50,7 @@ The default {{data-source}} is defined by the `securitySolution:defaultIndex` se
 The first time a user visits {{elastic-sec}} within a given {{kib}} [space](/deploy-manage/manage-spaces.md), the default {{data-source}} generates in that space and becomes active.
 
 ::::{note}
-In {{stack}}, your {{kib}} space must have the **Data View Management** [feature visibility](/deploy-manage/manage-spaces.md#spaces-control-feature-visibility) setting enabled for the default {{data-source}} to generate and become active in your space.
+In {{stack}}, your {{kib}} space must have the **Data View Management** [feature visibility](/deploy-manage/manage-spaces.md) setting enabled for the default {{data-source}} to generate and become active in your space.
 ::::