Merge branch 'main' into prepare-for-assembler

Author: colleenmcginnis

deploy-manage/toc.yml

@@ -784,11 +784,9 @@ toc:
                   - file: upgrade/deployment-or-cluster/reading-indices-from-older-elasticsearch-versions.md
               - file: upgrade/deployment-or-cluster/kibana.md
                 children:
+                  - file: upgrade/deployment-or-cluster/saved-object-migrations.md
                   - file: upgrade/deployment-or-cluster/kibana-roll-back.md    
-      - file: upgrade/ingest-components.md
-      - file: upgrade/internal-upgrade-processes.md
-        children:
-          - file: upgrade/internal-upgrade-processes/saved-object-migrations.md
+      - file: upgrade/ingest-components.md        
   - file: uninstall.md
     children:
       - file: uninstall/uninstall-elastic-cloud-enterprise.md

deploy-manage/upgrade/deployment-or-cluster/kibana.md

@@ -11,7 +11,7 @@ When you upgrade {{kib}}, you also upgrade the {{observability}} and {{elastic-s
 ::::{warning}
 {{kib}} automatically runs saved object migrations when required. To roll back to an earlier version in case of an upgrade failure, you **must** have a [backup snapshot](../../tools/snapshot-and-restore.md) that includes the `kibana` feature state. Snapshots include this feature state by default.
 
-For more information, refer to [Migrate saved objects](../internal-upgrade-processes/saved-object-migrations.md).
+For more information, refer to [Migrate saved objects](saved-object-migrations.md).
 
 ::::
 

deploy-manage/upgrade/internal-upgrade-processes/saved-object-migrations.md renamed to deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md

@@ -127,7 +127,7 @@ We have made several enhancements to minimize the impact, and this document desc
 
 ### Impact upon upgrading to version 8.x or later [saved-object-ids-impact-upon-upgrading]
 
-Every time you upgrade {{kib}}, [saved objects are migrated to a new format](/deploy-manage/upgrade/internal-upgrade-processes/saved-object-migrations.md). When you first upgrade to version 8.x or later, this migration process will start enforcing globally unique saved object IDs.
+Every time you upgrade {{kib}}, [saved objects are migrated to a new format](/deploy-manage/upgrade/deployment-or-cluster/saved-object-migrations.md). When you first upgrade to version 8.x or later, this migration process will start enforcing globally unique saved object IDs.
 
 In practical terms, **any old saved objects that exist in a custom space will have their IDs changed to a new UUID**, while saved objects in the Default space will be unchanged. This is how we can ensure that every saved object ID is unique. For example: if you had dashboard "123" in the Default space and dashboard "123" in Another space, after the upgrade you would have dashboard "123" in the Default space and dashboard "456" in Another space.
 

deploy-manage/upgrade/internal-upgrade-processes.md

@@ -12,11 +12,8 @@ This guide shows how you can use {{esql}} to query and aggregate your data.
 
 ::::{tip}
 This getting started is also available as an [interactive Python notebook](https://github.com/elastic/elasticsearch-labs/blob/main/notebooks/esql/esql-getting-started.ipynb) in the `elasticsearch-labs` GitHub repository.
-
 ::::
 
-
-
 ## Prerequisites [esql-getting-started-prerequisites]
 
 To follow along with the queries in this guide, you can either set up your own deployment, or use Elastic’s public {{esql}} demo environment.
@@ -426,3 +423,5 @@ For more about data processing with {{esql}}, refer to [Data processing with DIS
 
 To learn more about {{esql}}, refer to [{{esql}} reference](elasticsearch://reference/query-languages/esql.md).
 
+Learn more about using {{esql}} for Search use cases in this tutorial: [Search and filter with {{esql}}](/solutions/search/esql-full-text-filter-tutorial.md).
+

explore-analyze/find-and-organize/saved-objects.md

@@ -35,7 +35,7 @@ You can use it:
 - In your queries to {{es}} APIs, using the [`_query` endpoint](/explore-analyze/query-filter/languages/esql-rest.md) that accepts queries written in {{esql}} syntax.
 - Within various {{kib}} tools such as Discover and Dashboards, to explore your data and build powerful visualizations.
 
-% Learn more in [Getting started with {{esql}}](/solutions/search/get-started.md), or try [our training course](https://www.elastic.co/training/introduction-to-esql).
+Learn more about using {{esql}} for Search use cases in this tutorial: [Search and filter with {{esql}}](/solutions/search/esql-full-text-filter-tutorial.md).
 
 ## Next steps
 

explore-analyze/query-filter/languages/esql-getting-started.md

@@ -7,7 +7,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/query-filter-context.html
 ---
 
-# QueryDSL
+# Query DSL
 
 $$$filter-context$$$
 

explore-analyze/query-filter/languages/esql.md

@@ -14,7 +14,8 @@ Use the following quickstarts to get hands-on experience with Elasticsearch APIs
 - [Index and search data using Elasticsearch APIs](elasticsearch-basics-quickstart.md): Learn about indices, documents, and mappings, and perform a basic search using the Query DSL.
 - [Basic full-text search and filtering in Elasticsearch](querydsl-full-text-filter-tutorial.md): Learn about different options for querying data, including full-text search and filtering, using the Query DSL.
 - [Analyze eCommerce data with aggregations using Query DSL](/explore-analyze/query-filter/aggregations/tutorial-analyze-ecommerce-data-with-aggregations-using-query-dsl.md): Learn how to analyze data using different types of aggregations, including metrics, buckets, and pipelines.
-% - [Getting started with ES|QL](esql-getting-started.md): Learn how to query and aggregate your data using ES|QL.
+% - [Getting started with {{esql}}](esql-getting-started.md): Learn how to query and aggregate your data using {{esql}}.
+- [Search and filter with {{esql}}](esql-full-text-filter-tutorial.md): Learn how to perform full-text and semantic search in {{esql}}, combined with filtering.
 - [Semantic search](semantic-search/semantic-search-semantic-text.md): Learn how to create embeddings for your data with `semantic_text` and query using the `semantic` query.
  - [Hybrid search](hybrid-semantic-text.md): Learn how to combine semantic search using`semantic_text` with full-text search.
 - [Bring your own dense vector embeddings](vector/bring-own-vectors.md): Learn how to ingest dense vector embeddings into Elasticsearch.