Merge branch 'main' of github.com:elastic/docs-content into more-ess-references

Author: florent-leborgne

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

@@ -3,6 +3,7 @@ mapped_urls:
   - https://www.elastic.co/guide/en/serverless/current/general-check-subscription.html
   - https://www.elastic.co/guide/en/cloud/current/ec-subscription-overview.html
   - https://www.elastic.co/guide/en/cloud/current/ec-select-subscription-level.html
+  - https://www.elastic.co/guide/en/cloud/current/ec-licensing.html
 applies_to:
   deployment:
     ess: all

deploy-manage/license.md

@@ -1,11 +1,35 @@
 ---
-mapped_pages:
-  - https://www.elastic.co/guide/en/cloud/current/ec-licensing.html
+applies_to:
+  deployment:
+    ece:
+    ech:
+    ess:
+    self:
+  serverless:
 ---
 
-# Manage your license [ec-licensing]
+# Manage your license  
 
-For more information on what is available with different subscription levels, check [our pricing page](https://www.elastic.co/pricing). You are entitled to use all of the features that match your subscription level. Please use them to your heart’s content.
+Your Elastic license determines which features are available and what level of support you receive. 
 
-Your subscription determines [which features are available](https://www.elastic.co/subscriptions/cloud). For example, machine learning requires a Platinum or Private subscription and is not available if you upgrade to a Gold subscription. Similarly, SAML Single Sign-On requires an Enterprise subscription.
+Depending on your deployment type, licenses and subscriptions are applied at different levels:
 
+* **{{ecloud}}, {{ece}}, and {{eck}}:** Licenses and subscriptions are controlled at the orchestrator or organization level, and apply to all related deployments.
+* **Self-managed {{es}}:** Licenses are controlled at the cluster level, and apply only to a single cluster.
+
+For a comprehensive comparison of the available subscription levels, see [Elastic subscriptions](https://www.elastic.co/subscriptions).
+
+Use the topics in this section to manage your license or start a trial:  
+
+- [{{ecloud}}](/deploy-manage/cloud-organization/billing/manage-subscription.md): Applies to both {{ech}} deployments and {{serverless-full}} projects in your Cloud organization
+- [{{ece}}](/deploy-manage/license/manage-your-license-in-ece.md)  
+- [{{eck}}](/deploy-manage/license/manage-your-license-in-eck.md)  
+- [Self-managed cluster](/deploy-manage/license/manage-your-license-in-self-managed-cluster.md)  
+
+## Additional resources  
+
+Explore these resources for details on subscriptions and features:
+
+- [{{stack}} subscriptions](https://www.elastic.co/subscriptions)  
+- [{{ecloud}} features](https://www.elastic.co/subscriptions/cloud)  
+- [{{ecloud}} pricing](https://www.elastic.co/pricing)  

deploy-manage/license/manage-your-license-in-ece.md

@@ -1,9 +1,12 @@
 ---
+navigation_title: "{{ece}}"
+applies_to:
+  ece: 
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-enterprise/current/ece-add-license.html
 ---
 
-# Manage your license in ECE [ece-add-license]
+# Manage your license in {{ece}} [ece-add-license]
 
 The use of Elastic Cloud Enterprise requires a valid license, which you can obtain from Elastic and add to your installation following the steps described in this document. When you first install ECE we automatically activate ECE with a trial license that is valid for 30 days.
 

deploy-manage/license/manage-your-license-in-eck.md

@@ -1,12 +1,13 @@
 ---
+navigation_title: "{{eck}}"
 applies_to:
   deployment:
     eck: all
 mapped_pages:
   - https://www.elastic.co/guide/en/cloud-on-k8s/current/k8s-licensing.html
 ---
 
-# Manage your license in ECK [k8s-licensing]
+# Manage your license in {{eck}} [k8s-licensing]
 
 When you install the default distribution of ECK, you receive a Basic license. Any Elastic stack application you manage through ECK will also be Basic licensed. Go to [https://www.elastic.co/subscriptions](https://www.elastic.co/subscriptions) to check which features are included in the Basic license for free.
 

deploy-manage/license/manage-your-license-in-self-managed-cluster.md

@@ -1,13 +1,16 @@
 ---
+navigation_title: "Self-managed cluster"
+applies_to:
+  self:
 mapped_pages:
   - https://www.elastic.co/guide/en/kibana/current/managing-licenses.html
 ---
 
-# Manage your license in self-managed cluster [managing-licenses]
+# Manage your license in a self-managed cluster [managing-licenses]
 
-By default, new installations have a Basic license that never expires. For the full list of features available at the Free and Open Basic subscription level, refer to {{subscriptions}}.
+By default, new installations have a Basic license that never expires. For the full list of features available at the Free and Open Basic subscription level, refer to [Elastic subscriptions](https://www.elastic.co/subscriptions).
 
-To explore all of the available solutions and features, start a 30-day free trial. You can activate a trial subscription once per major product version. If you need more than 30 days to complete your evaluation, request an extended trial at {{extendtrial}}.
+To explore all of the available solutions and features, start a 30-day free trial. You can activate a trial subscription once per major product version. If you need more than 30 days to complete your evaluation, [request an extended trial](https://www.elastic.co/trialextension).
 
 To view the status of your license, start a trial, or install a new license, go to the **License Management** page using the navigation menu or the [global search field](../../explore-analyze/find-and-organize/find-apps-and-objects.md).
 

deploy-manage/toc.yml

@@ -790,8 +790,8 @@ toc:
       - file: cloud-organization/tools-and-apis.md
   - file: license.md
     children:
-      - file: license/manage-your-license-in-eck.md
       - file: license/manage-your-license-in-ece.md
+      - file: license/manage-your-license-in-eck.md
       - file: license/manage-your-license-in-self-managed-cluster.md
   - file: maintenance.md
     children:

deploy-manage/tools/snapshot-and-restore.md

@@ -106,7 +106,7 @@ In Elasticsearch 8.0 and later versions, feature states are the only way to back
 
 ## How snapshots work
 
-Snapshots are **automatically deduplicated** to save storage space and reduce network transfer costs. To back up an index, a snapshot makes a copy of the index’s [segments](/solutions/search/search-approaches/near-real-time-search.md) and stores them in the snapshot repository. Since segments are immutable, the snapshot only needs to copy any new segments created since the repository’s last snapshot.
+Snapshots are **automatically deduplicated** to save storage space and reduce network transfer costs. To back up an index, a snapshot makes a copy of the index’s [segments](/manage-data/data-store/near-real-time-search.md) and stores them in the snapshot repository. Since segments are immutable, the snapshot only needs to copy any new segments created since the repository’s last snapshot.
 
 Each snapshot is **logically independent**. When you delete a snapshot, Elasticsearch only deletes the segments used exclusively by that snapshot. Elasticsearch doesn’t delete segments used by other snapshots in the repository.
 

explore-analyze/query-filter/tools.md

@@ -8,16 +8,16 @@ mapped_pages:
 
 # Query tools [devtools-kibana]
 
-Elasticsearch offers tools that you can use to query your data, manage those queries, and optimize them to be as efficient as possible.
+Access these specialized tools in Kibana and the Serverless UI to develop, debug, and refine your search queries while monitoring their performance and efficiency.
 
-|     |     |
-| --- | --- |
-| [Saved queries](tools/saved-queries.md)  |  Save your searches and queries to reuse them later.   |
+| Tool | Function |
+|------|----------|
+| [Saved queries](tools/saved-queries.md) | Save your searches and queries to reuse them later. |
 | [Console](tools/console.md) | Interact with the REST APIs of {{es}} and {{kib}}, including sending requests and viewing API documentation. |
 | [{{searchprofiler}}](tools/search-profiler.md) | Inspect and analyze your search queries. |
-| [Grok Debugger   ](tools/grok-debugger.md) | Build and debug grok patterns before you use them in your data processing pipelines. |
-| [Painless Lab](../scripting/painless-lab.md) | [beta] Test and debug Painless scripts in real-time. |
-| [Playground](tools/playground.md)   |  Combine your Elasticsearch data with the power of large language models (LLMs) for retrieval augmented generation (RAG), using a chat interface.   |
+| [Grok Debugger](tools/grok-debugger.md) | Build and debug grok patterns before you use them in your data processing pipelines. |
+| [Painless Lab](../scripting/painless-lab.md) | [beta] Test and debug Painless scripts in real-time. |
+| [Playground](tools/playground.md) | Combine your Elasticsearch data with the power of large language models (LLMs) for retrieval augmented generation (RAG), using a chat interface. |
 
 
 

solutions/search/search-approaches/near-real-time-search.md renamed to manage-data/data-store/near-real-time-search.md

@@ -3,7 +3,6 @@ mapped_pages:
   - https://www.elastic.co/guide/en/elasticsearch/reference/current/near-real-time.html
 applies_to:
   stack:
-  serverless:
 ---
 
 # Near real-time search [near-real-time]
@@ -14,15 +13,15 @@ Lucene, the Java libraries on which {{es}} is based, introduced the concept of p
 
 Sitting between {{es}} and the disk is the filesystem cache. Documents in the in-memory indexing buffer ([Figure 1](#img-pre-refresh)) are written to a new segment ([Figure 2](#img-post-refresh)). The new segment is written to the filesystem cache first (which is cheap) and only later is it flushed to disk (which is expensive). However, after a file is in the cache, it can be opened and read just like any other file.
 
-:::{image} ../../../images/elasticsearch-reference-lucene-in-memory-buffer.png
+:::{image} /images/elasticsearch-reference-lucene-in-memory-buffer.png
 :alt: A Lucene index with new documents in the in-memory buffer
 :title: A Lucene index with new documents in the in-memory buffer
 :name: img-pre-refresh
 :::
 
 Lucene allows new segments to be written and opened, making the documents they contain visible to search ​without performing a full commit. This is a much lighter process than a commit to disk, and can be done frequently without degrading performance.
 
-:::{image} ../../../images/elasticsearch-reference-lucene-written-not-committed.png
+:::{image} /images/elasticsearch-reference-lucene-written-not-committed.png
 :alt: The buffer contents are written to a segment, which is searchable, but is not yet committed
 :title: The buffer contents are written to a segment, which is searchable, but is not yet committed
 :name: img-post-refresh

manage-data/toc.yml

@@ -4,6 +4,7 @@ toc:
   - file: data-store.md
     children:
       - file: data-store/index-basics.md
+      - file: data-store/near-real-time-search.md
       - file: data-store/data-streams.md
         children:
           - file: data-store/data-streams/set-up-data-stream.md