Updated instructions

Author: mnocon

docs/search/search_engines/solr_search_engine/install_solr.md

@@ -37,18 +37,19 @@ The examples below copy from the root of your DXP project to the place you've ex
     ``` bash
     # Make sure to replace the /opt/solr/ path with where you have placed Solr
     cd /opt/solr
-    mkdir -p server/ibexa/template
-    cp -R <project_root>/vendor/ibexa/solr/src/lib/Resources/config/solr/solr.languages server/ibexa/template
-    cp -R <project_root>/vendor/ibexa/solr/src/lib/Resources/config/solr/{managed-schema.xml,custom-fields-types-solr9.xml,language-fieldtypes.xml} server/ibexa/template
-    cp server/solr/configsets/_default/conf/{solrconfig.xml,stopwords.txt,synonyms.txt} server/ibexa/template
+    mkdir -p server/ibexa/template/conf
+    cp -R <project_root>/vendor/ibexa/solr/src/lib/Resources/config/solr/solr.languages server/ibexa/template/conf
+    cp -R <project_root>/vendor/ibexa/solr/src/lib/Resources/config/solr/{managed-schema.xml,custom-fields-types-solr9.xml,language-fieldtypes.xml} server/ibexa/template/conf
+    cp server/solr/configsets/_default/conf/{solrconfig.xml,stopwords.txt,synonyms.txt} server/ibexa/template/conf
     cp server/solr/solr.xml server/ibexa
 
     # Modify solrconfig.xml to remove the section that doesn't agree with your schema
-    sed -i.bak '/<updateRequestProcessorChain name="add-unknown-fields-to-the-schema".*/,/<\/updateRequestProcessorChain>/d' server/ibexa/template/solrconfig.xml
+    sed -i.bak '/<updateRequestProcessorChain name="add-unknown-fields-to-the-schema".*/,/<\/updateRequestProcessorChain>/d' server/ibexa/template/conf/solrconfig.xml
 
     # Start Solr (but apply autocommit settings below first if you need to)
+    # The configuration path is an absolute path
     bin/solr -s ibexa
-    bin/solr create_core -c collection1 -d server/ibexa/template
+    bin/solr create_core -c collection1 -d /opt/solr/server/ibexa/template
     ```
 
 === "Solr 7 and 8"
@@ -89,6 +90,8 @@ To set SolrCloud up follow [SolrCloud reference guide](https://solr.apache.org/g
 
 ### Continue Solr configuration
 
+#### Configure commit frequency
+
 The bundle doesn't commit Solr index changes directly on repository updates, leaving it up to you to tune this using `solrconfig.xml` as best practice suggests.
 
 This setting is **required** if you want to see the changes after publish.
@@ -108,6 +111,38 @@ It's strongly recommended to set-up `solrconfig.xml` like this:
 </autoSoftCommit>
 ```
 
+#### Configure spellcheck
+
+Configure the spellcheck component in `solrconfig.xml`:
+
+```xml
+  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
+    <lst name="spellchecker">
+      <str name="name">default</str>
+      <str name="field">meta_content__text_t</str>
+      <str name="classname">solr.DirectSolrSpellChecker</str>
+      <str name="distanceMeasure">internal</str>
+      <float name="accuracy">0.5</float>
+      <int name="maxEdits">2</int>
+      <int name="minPrefix">1</int>
+      <int name="maxInspections">5</int>
+      <int name="minQueryLength">4</int>
+      <float name="maxQueryFrequency">0.01</float>
+    </lst>
+  </searchComponent>
+```
+
+Add this `spellcheck` component to the `/select` request handler: 
+
+```xml
+  <requestHandler name="/select" class="solr.SearchHandler">
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+    <!-- […] -->
+  </requestHandler>
+```
+
 ### Generate Solr configuration automatically
 
 The command line tool `bin/generate-solr-config.sh` generates Solr configuration automatically.

docs/update_and_migration/from_4.6/update_from_4.6.md

@@ -378,18 +378,20 @@ Run the following scripts:
 
 This release adds support for [Solr 9](requirements.md#search).
 
-To update Solr within an existing [[= product_name =]] project, first refer to the [Solr 9 upgrade planning](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html) instruction.
+To update Solr within an existing [[= product_name =]] project, first refer to the [Solr 9 upgrade planning](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html) instructions.
 
-Then, perform the following additional actions:
+Then, follow the [instructions for setting up Solr 9 with [[= product_name =]]](/search/search_engines/solr_search_engine/install_solr.md#configure-and-start-solr) and merge them with your custom configuration.
 
-1. Adjust the configuration files:
+Changes include:
 
-    - rename the `schema.xml` configuration file to [`managed-schema.xml`](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-6.html#managed-schema-is-now-the-default)
-    - replace the contents of `custom-field-types.xml` [with the new content](https://github.com/ibexa/solr/blob/v4.6.22/src/lib/Resources/config/solr/custom-fields-types-solr9.xml), replacing the [removed `LatLonType` with the `LatLonPointSpatialField` field](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-7.html#deprecations-and-removed-features)
+1. Configuration files changes
 
-1. Configure the [Solr version in the project](install_solr.md#configure-solr-version).
+    - the `schema.xml` configuration file became [`managed-schema.xml`](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-6.html#managed-schema-is-now-the-default)
+    - the [removed `LatLonType` field is replaced by the `LatLonPointSpatialField` field](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-7.html#deprecations-and-removed-features)
 
-1. Finish the update by [refreshing the search index](reindex_search.md).
+1. New [Solr version parameter](install_solr.md#configure-solr-version)
+
+Once Solr 9 is fully configured, [refresh the search index](reindex_search.md).
 
 [[% include 'snippets/update/notify_support.md' %]]