ibexa · julitafalcondusza · Jun 21, 2023 · Jun 16, 2023 · Jun 16, 2023 · Jun 16, 2023
diff --git a/docs/administration/project_organization/architecture.md b/docs/administration/project_organization/architecture.md
@@ -28,7 +28,7 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 |[Persistence cache](persistence_cache.md)|The implementation of SPI\Persistence that decorates the main backend implementation.|
 |[Search](search.md)|Search API that allows both full-text search and querying the content.|
 |[SQL Storage Engine](search.md#legacy-search-engine)|Legacy search engine is SQL-based and uses Doctrine's database connection.|
-|[Solr Storage Engine](solr_search_engine.md)|Transparent drop-in replacement for the SQL-based Legacy search engine.|
+|[Solr Storage Engine](solr_overview.md)|Transparent drop-in replacement for the SQL-based Legacy search engine.|
 |[IO](file_management.md#native-io-handler)|The IO API is organized around two types of handlers, both used by the IOService.|
 |[IO Handler](clustering.md#dfs-io-handler)|The IO Handler manipulates metadata, making up for the potential inconsistency of network-based filesystems.|
 |[Recommendation](enable_personalization.md)|Recommendation API.|

diff --git a/docs/content_management/field_types/field_type_reference/field_type_reference.md b/docs/content_management/field_types/field_type_reference/field_type_reference.md
@@ -64,4 +64,4 @@ Legacy Search/Storage Engine index is limited to 255 characters in database desi
 so formatted and unformatted text blocks will only index the first part.
 In case of multiple selection Field Types like Keyword, Selection, Country, etc.,
 only the first choices are indexed. They are indexed only as a text blob separated by string separator.
-Proper indexing of these Field Types is done with [Solr Search engine](solr_search_engine.md).
+Proper indexing of these Field Types is done with [Solr Search engine](solr_overview.md).
diff --git a/docs/content_management/field_types/field_type_search.md b/docs/content_management/field_types/field_type_search.md
@@ -100,4 +100,4 @@ You could also define a custom Field definition for certain Fields, like for the
 
 !!! note
 
-    If you want to learn more about the Solr implementation and detailed information about configuring it, check out the [Solr Search Bundle](solr_search_engine.md).
+    If you want to learn more about the Solr implementation and detailed information about configuring it, check out the [Solr Search Bundle](solr_overview.md).
diff --git a/docs/content_management/url_management/url_api.md b/docs/content_management/url_management/url_api.md
@@ -27,4 +27,4 @@ in which you need to specify:
 ## URL search reference
 
 For the reference of Search Criteria and Sort Clauses you can use in URL search,
-see [URL search reference](url_search_reference.md).
+see [URL Search Criteria](url_search_criteria.md) and [URL Sort Clauses](url_search_sort_clauses.md).
diff --git a/docs/getting_started/install_ibexa_dxp.md b/docs/getting_started/install_ibexa_dxp.md
@@ -259,17 +259,17 @@ You may choose to replace the [default search engine](search.md#legacy-search-en
 
 === "Solr"
 
-    Follow [How to set up Solr search engine](solr_search_engine.md#how-to-set-up-solr-search-engine) to install Solr.
+    Follow [How to set up Solr search engine](install_solr.md) to install Solr.
 
 === "Elasticsearch"
 
     Do the following steps to enable Elasticsearch:
 
-    1. [Download and install Elasticsearch](elasticsearch_search_engine.md#step-1-download-and-install-elasticsearch)
-    2. [Verify that the Elasticsearch instance is up](elasticsearch_search_engine.md#step-2-verify-that-the-elasticsearch-instance-is-up)
-    3. [Set the default search engine](elasticsearch_search_engine.md#step-3-set-the-default-search-engine)
-    4. [Configure the search engine](elasticsearch_search_engine.md#step-4-configure-the-search-engine)
-    5. [Push the templates](elasticsearch_search_engine.md#step-5-push-the-templates)
+    1. [Download and install Elasticsearch](install_elastic_search.md)
+    2. [Verify that the Elasticsearch instance is up](install_elastic_search.md#verify-the-instance)
+    3. [Set the default search engine](install_elastic_search.md#set-the-default-search-engine)
+    4. [Configure the search engine](configure_elastic_search.md)
+    5. [Push the templates](install_elastic_search.md#push-the-templates)
 
     Configure the following parameter in the `.env` file:
 

diff --git a/docs/infrastructure_and_maintenance/cache/persistence_cache.md b/docs/infrastructure_and_maintenance/cache/persistence_cache.md
@@ -34,7 +34,7 @@ Notes:
   For instance tree operations or changes to Content Types are
   examples of operations that also need to invalidate content cache by tags.
 - Search is not defined as persistence and the queries themselves are not planned to be cached as they are too complex by design (for example, full text).
-  Use [Solr](solr_search_engine.md) which caches this for you to improve scale/performance, and to offload your database.
+  Use [Solr](solr_overview.md) which caches this for you to improve scale/performance, and to offload your database.
 
 For further details on which calls are cached or not, see details in the [Symfony Web Debug Toolbar](devops.md#web-debug-toolbar)
 which has info on cache use in two places:

diff --git a/docs/infrastructure_and_maintenance/clustering/clustering.md b/docs/infrastructure_and_maintenance/clustering/clustering.md
@@ -28,7 +28,7 @@ For further details on requirements, see [Requirements page](requirements.md).
 
 It is also recommended to use:
 
-- [Solr](solr_search_engine.md) or [Elasticsearch](elasticsearch_search_engine.md) for better search and performance
+- [Solr](solr_overview.md) or [Elasticsearch](elastic_search_overview.md) for better search and performance
 - a CDN for improved performance and faster ping time worldwide
     - you can use Fastly, which has native support as HTTP cache and CDN.
 - active/passive database for failover

diff --git a/docs/infrastructure_and_maintenance/performance.md b/docs/infrastructure_and_maintenance/performance.md
@@ -16,7 +16,7 @@ If you are in a hurry, the most important recommendations on this page are:
 - Dump optimized Composer autoload classmap
 - Use a full web (Nginx/Apache) server with vhost
 - Avoid shared filesystems for code (Docker for Mac/Win, VirtualBox/*, Vagrant, etc.), or find ways to optimize or work around the issues.
-- For clustering (mainly relevant for production/staging), reduce latency to Redis/Memcached, use Varnish and [Solr](solr_search_engine.md).
+- For clustering (mainly relevant for production/staging), reduce latency to Redis/Memcached, use Varnish and [Solr](solr_overview.md).
 
 ## Client
 
@@ -78,12 +78,12 @@ In production setups:
 
 ### Search
 
-- Use [Solr Bundle and Solr](solr_search_engine.md) to greatly offload your database and get more stable performance on your installation.
+- Use [Solr Bundle and Solr](solr_overview.md) to greatly offload your database and get more stable performance on your installation.
 
 ## Long-running console commands
 
 Executing long-running console commands can result in running out of memory.
-Two examples of such commands are a custom import command and the indexing command provided by the [Solr Bundle](solr_search_engine.md).
+Two examples of such commands are a custom import command and the indexing command provided by the [Solr Bundle](solr_overview.md).
 
 ### Reducing memory usage
 

diff --git a/docs/search/extensibility/create_custom_sort_clause.md b/docs/search/extensibility/create_custom_sort_clause.md
@@ -2,7 +2,7 @@
 description: Create custom Sort Clause to use with Solr and Elasticsearch search engines.
 ---
 
-# Create custom Search Criterion
+# Create custom Sort Clause
 
 To create a custom Sort Clause, do the following.
 

diff --git a/docs/search/extensibility/index_custom_elasticsearch_data.md b/docs/search/extensibility/index_custom_elasticsearch_data.md
@@ -4,7 +4,7 @@ description: Index custom data when using the Elasticsearch search engine.
 
 # Index custom Elasticsearch data
 
-[Elasticsearch](elasticsearch_search_engine.md) indexes content and Location data out of the box.
+[Elasticsearch](elastic_search_overview.md) indexes content and Location data out of the box.
 Besides what is indexed automatically, you can add additional data to the Elasticsearch index.
 
 To do so, subscribe to one of the following events:

diff --git a/docs/search/search_reindexing.md → docs/search/reindex_search.md b/docs/search/search_reindexing.md → docs/search/reindex_search.md
@@ -2,7 +2,7 @@
 description: Reindexing lets you create or refresh the search engine index.
 ---
 
-# Search reindexing
+# Reindex search
 
 To (re)create or refresh the search engine index for configured search engines (per SiteAccess repository), use the `php bin/console ibexa:reindex` command.
 

diff --git a/docs/search/search.md b/docs/search/search.md
@@ -8,9 +8,9 @@ page_type: landing_page
 [[= product_name =]] exposes a very powerful [Search API](search_api.md), allowing both full-text search and querying the content Repository using several built-in Search Criteria and Sort Clauses. These are supported across different search engines, allowing you to plug in another search engine without changing your code.
 
 [[= cards([
-    "search/search_engines",
-    "search/elasticsearch_search_engine",
-    "search/solr_search_engine",
+    "search/search_engines/search_engines",
+    "search/search_engines/elastic_search/elastic_search_overview",
+    "search/search_engines/solr_search_engine/solr_overview",
     "search/search_api",
     "search/search_criteria_and_sort_clauses",
     "search/extensibility/create_custom_search_criterion",

diff --git a/docs/search/search_engines.md b/docs/search/search_engines.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,4 +100,4 @@ You could also define a custom Field definition for certain Fields, like for the

		!!! note

		If you want to learn more about the Solr implementation and detailed information about configuring it, check out the [Solr Search Bundle](solr_search_engine.md).
		If you want to learn more about the Solr implementation and detailed information about configuring it, check out the [Solr Search Bundle](solr_overview.md).